Code review comment for lp:~jamesodhunt/upstart/serialise-remaining-objects

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?