Merge proposals dependent on lp://qastaging/~testtools-committers/testtools/trunk

lp://qastaging/~testtools-committers/testtools/trunk has no merge proposals.