Merge proposals dependent on lp://qastaging/~nataliabidart/desktopcouch/remove-testtools

lp://qastaging/~nataliabidart/desktopcouch/remove-testtools has no merge proposals.