Merge proposals dependent on lp:~vishvananda/nova/fix-subdir-tests

lp:~vishvananda/nova/fix-subdir-tests has no merge proposals.