fixing user, role and permissions upgrade unit tests according to recent fixes
Merge commit '66c5b42be8c8a3fa4812651846bb531717d7527d'