Fix whitespace issues found by Pep8 1.5.4+

Pep8 1.5.4+ fixes some bugs in whitespace related checks, so
adjust those in order to pass gating if we upgrade.

Change-Id: I8290c2b4f9b233889c3f151cdd5d8346fce8713e
Merge "Fix whitespace issues found by Pep8 1.5.4+"