[Merge] lp:~mdeslaur/upstart/apparmor-support into lp:upstart

[Marc Deslauriers]

Review: Resubmit

Testing uncovered an issue when deserialising state from an older version. Fixed.
-- 
https://code.launchpad.net/~mdeslaur/upstart/apparmor-support/+merge/164169
Your team Upstart Reviewers is requested to review the proposed merge of lp:~mdeslaur/upstart/apparmor-support into lp:upstart.