Merge proposals dependent on lp:~apw/canonical-qa-tracking/cleanup

lp:~apw/canonical-qa-tracking/cleanup has no merge proposals.