Merge proposals dependent on lp://qastaging/~ubuntu-on-ec2/vmbuilder/jenkins_kvm-maas-stilson2

1. jenkins_kvm-maas-stilson2
2. Dependent merge proposals