Restoring Shibboleth

This restores shibboleth on develop branch, based on the modifications made on the 2.10.x branch: #593