Merge proposals dependent on lp:~jml/testtools/tsfr-fixup

lp:~jml/testtools/tsfr-fixup has no merge proposals.