upstart

Merge proposals dependent on lp://staging/~jamesodhunt/upstart/fix-for-bug-912558-foo

  1. fix-for-bug-912558-foo
  2. Dependent merge proposals

lp://staging/~jamesodhunt/upstart/fix-for-bug-912558-foo has no merge proposals.