[JIRA] (HSEARCH-4790) Add compatibility with OpenSearch 2.5.0