[Merge] lp:~zulcss/nova/house-cleaning into lp:~ubuntu-server-dev/nova/havana

[Adam Gandelman]

Review: Needs Fixing

Looks good for the most part, but we're still stripping the version requirement of python-six via the patch.  Could we not just describe the python-six version req in d/control and remove that bit from the patch?
-- 
https://code.launchpad.net/~zulcss/nova/house-cleaning/+merge/186588
Your team Ubuntu Server Developers is subscribed to branch lp:~ubuntu-server-dev/nova/havana.