PQM

Merge proposals dependent on lp://staging/~oddbloke/pqm/test-fixes

lp://staging/~oddbloke/pqm/test-fixes has no merge proposals.