Support Shibboleth rudimentarily.
Merge branch 'master' into rca_port_shibboleth
Merge branch 'master' into rca_port_shibboleth