Fix jenkins failures

Mostly whitespace fixes, mixing of tabs and spaces, but also there was a
function call not closed off with a trailing parenthesis.

See http://jenkins.saltstack.com/job/salt-lint/636/violations/ for more
info.
Merge pull request #7982 from terminalmage/jenkins

Fix jenkins failures