Fix issues from infer diff report.
Before creating any new configure files (.conf) read the CONF_FILES_README.md