Merge "MergeOp: Retry when current revision is not found"