[Merge] lp:~smoser/nova/lp838581 into lp:~ubuntu-server-dev/nova/diablo

[Scott Moser]

The proposal to merge lp:~smoser/nova/lp838581 into lp:~ubuntu-server-dev/nova/diablo has been updated.

Description changed to:

This is cherry picked from the upstream commit that fixed this bug.
I have not tested this.  I'm in the process of doing so, but wanted to let others see the patch.


For more details, see:
https://code.launchpad.net/~smoser/nova/lp838581/+merge/78528
-- 
https://code.launchpad.net/~smoser/nova/lp838581/+merge/78528
Your team Ubuntu Server Developers is requested to review the proposed merge of lp:~smoser/nova/lp838581 into lp:~ubuntu-server-dev/nova/diablo.