Fixups for Puppet 3 regsubst & current apache Puppet module