Remove broken base puppet module
Remove Apache submodule
Add Puppet Labs Apache module