Shibboleth enhancements to work with other authentication methods and HAKA logout service.