[SP-1555] - Regression of PPP-3312 - Identical role and user name breaks when reports/folders are assigned either one of them (5.2 Suite)

cherry-pick of master commit 364f8cc93915fd053d28b8af592cc9c983ee2915
Merge pull request #2084 from aliakseihaidukou/SP-1555

[SP-1555] - Regression of PPP-3312 - Identical role and user name breaks...