(QENG-431) expanded and improved role support in beaker

- cleanup in response to review comments
Merge pull request #352 from anodelman/revert-343-revert-237-role-repair

(QENG-431) expanded and improved role support in beaker