Merge proposals dependent on lp://qastaging/~guijemont/paf/unit-tests

lp://qastaging/~guijemont/paf/unit-tests has no merge proposals.