Remove custom puppet apache module
Add official puppet apache module
Add puppetlabs/apache dependency
Changes due to updated puppetlabs/apache