Merge pull request #2599 from linquize/config-trailing-spaces config: Handle multiple spaces that follow a configuration value and precede a comment char