Launchpad itself

Merge proposals dependent on lp:~cprov/launchpad/bug-404693-resuming-builder-with-timeout

  1. bug-404693-resuming-builder-with-timeout
  2. Dependent merge proposals

lp:~cprov/launchpad/bug-404693-resuming-builder-with-timeout has no merge proposals.