Multiple backports#2022

reta merged 4 commits into

opensearch-project:3.xopensearch-project/opensearch-java:3.xfrom

reta:backport/backport-1967-to-3.xreta/opensearch-java:backport/backport-1967-to-3.xCopy head branch name to clipboard