Modified to match puppet 3.6.1 puppet.conf requirements.
Merge branch 'master' into centos