Revert "Downgrade puppetlabs-apache to version 0.0.4."

This reverts commit 7b9ea298cf4ae941af74381925b17a4b29337eb9.

Upgrading puppetlabs-apache to version 0.4.0 will give us important
variables in apache::params (specifically $conf_dir and $vdir) which
will allow us to modify the cgit module to run on both Debuntu and RHEL
systems -- which is useful because test.sh should be testing all modules
on both systems.

Of the two issues that 7b9ea298 addresses, I believe that our Oneiric
hosts have all gone the way of the dinosaur and we can work around the
docroot check by replacing 'MEANINGLESS ARGUMENT' with
'/tmp/meaningless_docroot'.

Conflicts:
	install_modules.sh

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