Add Shibboleth support
Merge branch 'develop' into release/2.0.6
Merge branch 'release/2.0.6'