[T6030][UPDATE] in case of concurrence error, we retry a few more times

Merged Javier Vescio requested to merge T6030 into 11.0-stage

Merge request reports