change unusual function definition style that pep8 flags
Merge pull request #6627 from hulu/pep8-indents

pep8 indentation adjustments that agree w/ Salt style guide
Merge pull request #6629 from hulu/weird-func-param-parenthesizing

change unusual function definition style that pep8 flags
bridge mod: rm unused exception vars
Merge pull request #6630 from cvrebert/patch-1

bridge mod: rm unused exception vars
comply w/ pep8 E203 (whitespace before ':')