Merge proposals dependent on lp:~justin-fathomdb/nova/bug724623-fix-2

lp:~justin-fathomdb/nova/bug724623-fix-2 has no merge proposals.