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

- reverts the revert of the unintended merger
- fixes for review comments