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

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