Fix imports ordering and separation

http://docs.openstack.org/developer/hacking/#imports

Change-Id: I851cba04ac3b74b12c82af799761f7182baeaeb6