Typo, white-space, PEP8 and formatting fixes.
Merge branch 'develop' of github.com:saltstack/salt into hotfix/modjk-formatting
Renamed the `lb` argument to `lbn` which is accepted by the style guide enforced by pylint.
Merge pull request #6673 from s0undt3ch/hotfix/modjk-formatting

Typo, white-space, PEP8 and formatting fixes.