Fix Pep8 indentation errors missed by Pep8 1.4.5

Pep8 1.4.6+ finds additional indentation errors. Fix them in
preparation of being able to switch to a newer Pep8 version.

Change-Id: I50493675c33524e577a0eebf3f9b74037ed9721c