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

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