puppetlabs/puppet — pull request #3071 by jpartlow (2014-09-10 18:29:43+00:00)
Title: Issue/stable/pup 3136 upstart acceptance

Re-targeted to stable.