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

1. qa-lab-tests_write_xml_to_adt_artifacts
2. Dependent merge proposals