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

[Stéphane Graber]

I think this looks good.

Do we have a test that runs upstart with no_inherit_env set and checks that the environment in that case is sane (exact match to what we'd expect)?
If we don't, we definitely should add that as your branch relaxes some of the existing tests in that regard.
-- 
https://code.launchpad.net/~jamesodhunt/upstart/bug-1159895/+merge/166836
Your team Upstart Reviewers is requested to review the proposed merge of lp:~jamesodhunt/upstart/bug-1159895 into lp:upstart.