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

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