157 Manage all roles in NeSI users feature package.  Rename admin roles to distinguish better between NeSI admins and site admins.
Merge branch 'sprint2-fixes' of github.com:nesi/nesi-webportal into sprint2-fixes