Re-enable pep8 tests, with a minor pep8 fix

Fixes: bug #1152431
Change-Id: If2c01eb97dfd303c5130008c3cd17c83a888a51a
Merge "Re-enable pep8 tests, with a minor pep8 fix"