Cleanup whitespace issues for pylint
Merge pull request #12956 from techhat/pylint

Cleanup whitespace issues for pylint