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

[Steve Langasek]

Dmitrijs, the only NIH_LIST_EMPTY() assertion that shows up as part of this patch is one that's being *removed*.  Are you concerned that the other assertions are latent bugs (incorrect assertions), like this one apparently was?  If not, can I suggest that review of those should be postponed to later, outside of landing this crasher fix?
-- 
https://code.launchpad.net/~jamesodhunt/upstart/bug-1199778/+merge/174138
Your team Upstart Reviewers is subscribed to branch lp:upstart.