[BISERVER-11758] - adding users to roles was using incorrect util for generating the tenant id, causing the cache to keep the old user credentials.  Also, removing users from roles were not getting purged from the cache.  cherry-picked from ce700ed.
Merge pull request #1644 from kurtwalker/BISERVER-11758-51

Biserver 11758 51