Fix indentation errors found by Pep8 1.4.6+

As a preparation in order to switch to a newer
Pep8 version in the future, fix the indentation errors
that are missed by Pep8 1.4.5 due to bugs.

Change-Id: I30acf8fdc1ae7eadcbc1849409c989c2422f0f8f
Closes-Bug: #1267994
Merge "Fix indentation errors found by Pep8 1.4.6+"