Merge "Move RbacAuthority class into separate module"