Merge proposals dependent on lp://staging/~rvb/maas/qa-lab-tests-rename

lp://staging/~rvb/maas/qa-lab-tests-rename has no merge proposals.