Merge "Rename initial config files from *.xml.conf to *.xml"