[Merge] lp:~noskcaj/ubuntu/trusty/jenkins-job-builder/ftbfs into lp:ubuntu/jenkins-job-builder

[Andrew Starr-Bochicchio]

Review: Approve

Uploaded. There were some issues merging it. Quilt and bzr were fighting again. So I just applied the commit as a patch:

https://bazaar.launchpad.net/~noskcaj/ubuntu/trusty/jenkins-job-builder/ftbfs/diff/5

Thanks!
-- 
https://code.launchpad.net/~noskcaj/ubuntu/trusty/jenkins-job-builder/ftbfs/+merge/212306
Your team Ubuntu branches is requested to review the proposed merge of lp:~noskcaj/ubuntu/trusty/jenkins-job-builder/ftbfs into lp:ubuntu/jenkins-job-builder.