#2336125 - Use the .yml file if it exists, and then use the 'config' file if not