Merge proposals dependent on lp://qastaging/~kissiel/checkbox/autopilot-fix

lp://qastaging/~kissiel/checkbox/autopilot-fix has no merge proposals.