upstart

Merge proposals dependent on lp://staging/~jamesodhunt/upstart/bug-1447756-the-actual-fix

  1. bug-1447756-the-actual-fix
  2. Dependent merge proposals

lp://staging/~jamesodhunt/upstart/bug-1447756-the-actual-fix has no merge proposals.