Merge proposals dependent on lp://qastaging/~rvb/maas/qa-test-rename

lp://qastaging/~rvb/maas/qa-test-rename has no merge proposals.