Merge proposals dependent on lp://qastaging/~jk0/python-novaclient/master

lp://qastaging/~jk0/python-novaclient/master has no merge proposals.