Merge proposals dependent on lp:~vishvananda/nova/fix-boto-2

lp:~vishvananda/nova/fix-boto-2 has no merge proposals.