Merge pull request #3605 from bittorf/mysqld-allow_spaces_in_config