Merge proposals dependent on lp://staging/~nuclearbob/autopilot/ubiquity-testing

lp://staging/~nuclearbob/autopilot/ubiquity-testing has no merge proposals.