Fix various config keys and template config keys to round trip more data
Merge pull request #1972 from jmullan/feature/fix_config_form

Fix various config keys and template config keys