Shibboleth: various PR followup/cleanup
Removed WAYF support from Shibboleth