Launchpad itself

Merge proposals dependent on lp:~cjwatson/launchpad/testfix-destroy-builder-aborted

  1. testfix-destroy-builder-aborted
  2. Dependent merge proposals

lp:~cjwatson/launchpad/testfix-destroy-builder-aborted has no merge proposals.