[Merge] lp:~jamesodhunt/upstart/bug-1258098 into lp:upstart

[Dimitri John Ledkov]

Review: Needs Information

The code looks ok, the test is not passing for me:

not ok 5 - ensure Session Init retains D-Bus address across a re-exec
	wrong value for running, expected 1 got 0
	at test_util_common.c:132 (wait_for_upstart).
Aborted (core dumped)

Also note: https://bugs.launchpad.net/upstart/+bug/1288243
-- 
https://code.launchpad.net/~jamesodhunt/upstart/bug-1258098/+merge/202458
Your team Upstart Reviewers is subscribed to branch lp:upstart.