Update to shibboleth role and allow changing the template directory

(cherry picked from commit ff86673d3a32e7a44f944f461135736708e08f81)

Conflicts:
	playbooks/roles/shibboleth/tasks/main.yml
Updates to apache role to make it more flexible and inline with nginx

(cherry picked from commit b006e39b4e67226126649c5b9945cde8c41614a3)

Conflicts:
	playbooks/roles/apache/tasks/apache_site.yml
	playbooks/roles/apache/tasks/main.yml