Make resolve conflict in transport version its own task#134842

rjernst merged 2 commits intoelastic:mainelastic/elasticsearch:mainfrom

rjernst:transport/resolve_conflict_taskrjernst/elasticsearch:transport/resolve_conflict_taskCopy head branch name to clipboard