Merge proposals dependent on lp:~smoser/nova/trunk.lp851145

lp:~smoser/nova/trunk.lp851145 has no merge proposals.