Merge proposals dependent on lp:~clint-fewbar/upstart-cookbook/trunk

lp:~clint-fewbar/upstart-cookbook/trunk has no merge proposals.