Backporting nova host manager changes into ironic

Some very trivial pep8 fixes need to go back into the ironic tree
in case of future round-trip revisions.  This patch just backports
then so they won't be forgotten.

Change-Id: I6142c5fa9d06462c1cda863b0d32ced6f06ac66a
Merge "Backporting nova host manager changes into ironic"