changes for puppet 3
Merge branch 'master' of https://github.com/OSBI/puppet-apache