(refs#2503) Revert "config.defaults.yml is now config.defaults.yml.erb and is interpreted for erb accordingly"

This reverts commit aad5ef06f76dc08f36f1b2c4a8f4757d92a47690
Revert renaming of config.defaults.yml file (refs#2503)
Correct indentation from a previous commit (c0722fc39c8cc66031e61df85bdc00669a9c3709) (refs#2503)