Fix inconsistent indentation in config file templates

In the config file templates, some parameters are commented out with a
pound sign, and others are commented out using a pound sign and a space.
This has led to some confusion when people uncomment some params to use
them and then there are errors when PyYAML tries to render the data.

This commit makes the commenting of config parameters uniform, using
just a pound sign with no extra space.
Merge pull request #7230 from terminalmage/conf-file-indentation

Fix inconsistent indentation in config file templates