Issue/stable/pup 3136 upstart acceptance

Re-targeted to stable.