Merge proposals dependent on lp:~xnox/upstart/fix-qemu-test

lp:~xnox/upstart/fix-qemu-test has no merge proposals.