Merge "suppress warn log if replying 500 just for OptimisticLockFailedException"