edits for same user in role twice [KFSQA-584]
Merge remote-tracking branch 'origin/KFSQA-584' into KFSQA-584