reintegrate changes on puppetlabs/puppetlabs-apache