fix pep8 errors that apparently slipped in

Apparently, a couple of H302 issues have slipped into Nova, possibly
due to hacking releases or a bad merge commit. Fix these as they are
blocking some other patches.

Change-Id: Icc42e060492bc74febc9414b63970ee71fb9c27c
Merge "fix pep8 errors that apparently slipped in"