Merge proposals dependent on lp://staging/~rcj/vmbuilder/jenkins_kvm-test

lp://staging/~rcj/vmbuilder/jenkins_kvm-test has no merge proposals.