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

- cleanup in response to review comments