Merge proposals dependent on lp://staging/~beehock/upstart/upstart.fix-328881

lp://staging/~beehock/upstart/upstart.fix-328881 has no merge proposals.