[Merge] lp:~jamesodhunt/upstart/allow-multiple-cmdline-confdirs into lp:upstart

[Dmitrijs Ledkovs]

Review: Approve

The new tests look good to me & pass here.
Merging into trunk results in bzr conflicts, so please resolve them yourself. Apart from that, approved.
-- 
https://code.launchpad.net/~jamesodhunt/upstart/allow-multiple-cmdline-confdirs/+merge/156512
Your team Upstart Reviewers is subscribed to branch lp:upstart.