Merge proposals dependent on lp://staging/~blamar/nova/nova-ubuntu-libvirt-refactor-test

lp://staging/~blamar/nova/nova-ubuntu-libvirt-refactor-test has no merge proposals.