Merge proposals dependent on lp://qastaging/~jamesodhunt/upstart/bug-1238078

lp://qastaging/~jamesodhunt/upstart/bug-1238078 has no merge proposals.