Add changes made in 1.x for manual backport#809

joshpalis merged 1 commit intoopensearch-project:mainopensearch-project/opensearch-sdk-java:mainfrom

ryanbogan:catch_up_mainryanbogan/opensearch-sdk:catch_up_mainCopy head branch name to clipboard