white space fix
Merge branch 'develop' of https://github.com/saltstack/salt into pylint_fixes
Merge pull request #11507 from rallytime/pylint_fixes

Pylint fixes