Merge branch '2.x' into backport/backport-987-to-2.x · opensearch-project/opensearch-dashboards-functional-test@b2758ca