Merge proposals dependent on lp:upstart/0.3

lp:upstart/0.3 has no merge proposals.