Merge proposals dependent on lp://staging/~nskaggs/autopilot/increase-launch-timeout

lp://staging/~nskaggs/autopilot/increase-launch-timeout has no merge proposals.