WIP: Fixes and Optimizes the Apache Configuration

Previously, the Apache servername.conf files existed in different
classes for Brokers and Nodes.  Furthermore, the broker class did
not contain a dependency on the httpd service.  Therefore, httpd
would not be enabled and running after the puppet agent run.