Fixes import order errors

Change-Id: I3e35230dd2d96ab9f5a8c11b9ec1cd8d2d00e347
trivial pep whitespace fix

Fix multiple spaces after keyword pep8 error, causes our pep8
gate to fail (pep8 1.3.4)

Change-Id: I67ab86ce17a1a91f8dab61efb18b83b22d2e1488
Signed-off-by: Steven Hardy <shardy@redhat.com>
Merge "Fixes import order errors"