Made the whitespace consistent in config files.

This may ease the frustration of web-developers doing upgrades.
Rebased `web.Template.config` - reapplied the whitespace fixes.
Merge branch 'U4-898' of https://github.com/leekelleher/Umbraco-CMS into leekelleher-U4-898