Merge proposals dependent on lp://qastaging/~cjohnston/ubuntu-ci-services-itself/jenkins-deb

1. jenkins-deb
2. Dependent merge proposals