Re-jigged roles to make use of the new paradigm of roles in organizations [fixes #53080235]