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

This re-applies the reverted role support for beaker.