MAESTRO-2974 better handling of duplicate roles.