(PUP-3010) Allow Upstart jobs on Amazon Linux
Merge branch 'pull/2869/head'

* pull/2869/head:
  (PUP-3010) Allow Upstart jobs on Amazon Linux