Backport/backport 16818 to 2.x take2#17142

msfroh merged 4 commits intoopensearch-project:2.xopensearch-project/OpenSearch:2.xfrom

msfroh:backport/backport-16818-to-2.x-take2msfroh/OpenSearch:backport/backport-16818-to-2.x-take2Copy head branch name to clipboard