The upstart files have the `.conf` extension
Merge branch 'develop' into stable