[Merge] lp:~vorlon/upstart/upstart-fix-racy-tests into lp:upstart

[Steve Langasek]

Related test failures from Ubuntu autopkgtest:

https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-yakkety/yakkety/amd64/u/upstart/20160430_060848@/log.gz
-- 
https://code.launchpad.net/~vorlon/upstart/upstart-fix-racy-tests/+merge/293563
Your team Upstart Reviewers is requested to review the proposed merge of lp:~vorlon/upstart/upstart-fix-racy-tests into lp:upstart.