Merge rbac into public repo

--tenant - missing a dash