[Merge] lp:~jamesodhunt/upstart/python-upstart-module into lp:upstart

[James Hunt]

Note that to run the unittests, you'll need a build of Upstart containing:

lp:~jamesodhunt/upstart/allow-multiple-cmdline-confdirs
-- 
https://code.launchpad.net/~jamesodhunt/upstart/python-upstart-module/+merge/157549
Your team Upstart Reviewers is requested to review the proposed merge of lp:~jamesodhunt/upstart/python-upstart-module into lp:upstart.