Fixed IR-32. Added new role and modified user role n.b. shibboleth changes not in GIT