[Merge] lp:~stgraber/upstart/upstart-dbus-events into lp:upstart

[Stéphane Graber]

Rebased the branch on current upstart trunk to resolve the merge conflict that Launchpad was reporting.
This means that the MP commit history is likely to be a bit wrong, besides that the diff looks good and tests still pass.
-- 
https://code.launchpad.net/~stgraber/upstart/upstart-dbus-events/+merge/139726
Your team Upstart Reviewers is subscribed to branch lp:upstart.