Merge proposals dependent on lp://qastaging/~ronglu-wen/plainbox/plainbox-test

lp://qastaging/~ronglu-wen/plainbox/plainbox-test has no merge proposals.