Merge branch 'master' of https://github.com/andreyev/puppetlabs-apache
Merge branch 'master' of https://github.com/andreyev/puppetlabs-apache