[Merge] lp:~jamesodhunt/upstart/serialise-remaining-objects into lp:upstart

[Steve Langasek]

Review: Needs Fixing

After the merge of lp:~mdeslaur/upstart/apparmor-support, this no longer merges cleanly into trunk; and the conflicts in init/tests/test_state.c are non-trivial.  James, can you please resolve these conflicts on your branch and resubmit?
-- 
https://code.launchpad.net/~jamesodhunt/upstart/serialise-remaining-objects/+merge/163151
Your team Upstart Reviewers is subscribed to branch lp:upstart.