Merge proposals dependent on lp://staging/~brendan-donegan/maas/qa-lab-tests_bootstrap_no_upload_tools

lp://staging/~brendan-donegan/maas/qa-lab-tests_bootstrap_no_upload_tools has no merge proposals.