Comply with new hacking release

Another couple of small issues to pass all PEP8 tests in
the new hacking release

Change-Id: I0d8aebdb27b03630b6de2186d32f58b3d6a1957d
Merge "Comply with new hacking release"