Merge proposals dependent on lp:~jason-koelker/nova/lp810092

lp:~jason-koelker/nova/lp810092 has no merge proposals.