Merge proposals dependent on lp:~vorlon/upstart/upstart-fix-racy-tests

lp:~vorlon/upstart/upstart-fix-racy-tests has no merge proposals.