Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Catch bad args
Fix test=True when overriding configuration setting
Merge branch 'develop' into 10877
Merge pull request #11215 from cachedout/10877

Fix test=true when overriding configuration value