Fixes based on resharding disruption tests#130870

lkts merged 3 commits intoelastic:mainelastic/elasticsearch:mainfrom

lkts:reshard_disruption_testlkts/elasticsearch:reshard_disruption_testCopy head branch name to clipboard