Change the inheritance chain a bit

This replaces https://github.com/theforeman/puppet-puppet/pull/61.