Merge pull request #3662 from kgaillot/compat
Drop code support for Upstart and Nagios resources and rkt bundles