Merge proposals dependent on lp://staging/~xnox/upstart/fix-private-telinit

lp://staging/~xnox/upstart/fix-private-telinit has no merge proposals.