Preparations for puppetlabs-apache

These are needed for https://github.com/theforeman/puppet-puppet/pull/123, but can be merged already. They simplify code and make testing easier.