Merge proposals dependent on lp:~usrleon/nova/small_fix

lp:~usrleon/nova/small_fix has no merge proposals.