Merge proposals dependent on lp://staging/~javier.collado/autopilot/bug1285575

lp://staging/~javier.collado/autopilot/bug1285575 has no merge proposals.