saltstack/salt — pull request #18229 by rallytime (2014-11-18 21:25:47+00:00)
Title: Fix some pylint errors on develop

There are some more pylint errors left-over from a merge-forward.
However, those will be cleaned up on the next merge-forward.