Merge proposals dependent on lp://qastaging/~canonical-scott/upstart/trunk

lp://qastaging/~canonical-scott/upstart/trunk has no merge proposals.