Merge proposals dependent on lp:~canonical-platform-qa/autopilot/cpo-base-classes-fix

lp:~canonical-platform-qa/autopilot/cpo-base-classes-fix has no merge proposals.