[Merge] lp:~gnuoy/python-novaclient/juno-update-deps into lp:~ubuntu-server-dev/python-novaclient/juno

[Chuck Short]

Can you clean up the merge conflicts? 
-- 
https://code.launchpad.net/~gnuoy/python-novaclient/juno-update-deps/+merge/225674
Your team Ubuntu Server Developers is requested to review the proposed merge of lp:~gnuoy/python-novaclient/juno-update-deps into lp:~ubuntu-server-dev/python-novaclient/juno.