Considerable work with applications/shibboleth.

Change-Id: I356ef43ca946f75ac8588291c1673eba75ee03ce