Merge proposals dependent on lp://staging/~michael.nelson/launchpad/delegate-to-buildfarmjob

1. delegate-to-buildfarmjob
2. Dependent merge proposals