Remove puppetlabs/apache as a submodule
Use forked puppetlabs/apache
Once again, remove PuppetLabs primary Apache module