Merge proposals dependent on lp:~rvb/maas-test/cleanup-control-c

lp:~rvb/maas-test/cleanup-control-c has no merge proposals.