Updates to apache role to make it more flexible and inline with nginx
(cherry picked from commit b006e39b4e67226126649c5b9945cde8c41614a3)
Old style role pipe missed
(cherry picked from commit 8e48f75825e556988cf62e7a4ce7df81525b1d7e)
Allows override of nginx configuration templates via simple variable
(cherry picked from commit be5948d91e7a88748a04fe37851b5a1bf6ce9e5c)