Revert "Revert "Downgrade puppetlabs-apache to version 0.0.4.""

This reverts commit 3afc75132aa3a7d3cae911ae5e7166383b9ee4ba.

The new apache module has started managing /etc/httpd/conf/httpd.conf
with a template that has some significant differences than our template
in the cgit module.

Change-Id: I99795d35596f35dfc34e89891155dd2b83e465fe
Merge "Revert "Revert "Downgrade puppetlabs-apache to version 0.0.4."""