Rename puppet::config to puppet::conf to ease migration to theforeman-puppet
Merge branch 'master' of github.com:camptocamp/puppet-puppet into sub/puppet