OOIION-1835: Fix roles UI issues (also fixes OOIION-1831)
Merge pull request #2009 from mmeisinger/fix1835_role

OOIION-1835: Fix roles UI issues (also fixes OOIION-1831)