BZ1002522 - Roles for web UI should follow some naming convention
(cherry picked from commit a0af8aa9aa8847cbaf6505cc02ab642c859fc5fa)