Fix E117 for pycodestyle (pep8) 2.5.0

The new 2.5.0 release of pycodestyle enforces E117
and is not managed by upper-constraints so we have
to fix the violations. Thankfully there are only a
few and they are fixed here.

Change-Id: Ic71eaf9b3552dfa6603632e556b102696c8d76e4
3 files changed