XNAT-3135,XNAT-3136: Add support for custom user groups