fix() : modification to prevent merge conflicts

2 jobs for fix/11061_prevent_role_deletion in 56 seconds (queued for 7 seconds)