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

[James Hunt]

Note that the Python scenario tests will fail unless /sbin/init on the test system actually has the fix for bug 1269731. This will be much easier to test once lp:~jamesodhunt/upstart/fix-python-tests gets merged into lp:upstart since that allows the tests to run against different Upstart binaries.
-- 
https://code.launchpad.net/~jamesodhunt/upstart/bug-1269731/+merge/202083
Your team Upstart Reviewers is requested to review the proposed merge of lp:~jamesodhunt/upstart/bug-1269731 into lp:upstart.