Bug 21626: (QA follow-up) Remove duplicate roles