Merge remote-tracking branch 'origin/AC-14039' into aprilrelease

Author: glo71317

dev/tests/integration/framework/Magento/TestFramework/ApplicationStateComparator/_files/state-filter-list.php

@@ -112,8 +112,6 @@
         // TODO: Do we need resetState for the connection?
         Magento\Elasticsearch\SearchAdapter\ConnectionManager::class => ['client' => null],
         // TODO: Do we need resetState for the connection?
-        Magento\Elasticsearch8\Model\Client\Elasticsearch::class => ['client' => null],
-        // TODO: Do we need resetState for the connection?
         Magento\Webapi\Model\Authorization\TokenUserContext::class => ['request' => null],
         Magento\Framework\Json\Helper\Data::class => ['_request' => null],
         Magento\Directory\Helper\Data::class => ['_request' => null],

dev/tests/integration/framework/Magento/TestFramework/ApplicationStateComparator/_files/state-skip-list.php

@@ -524,6 +524,7 @@
         Magento\GroupedProduct\Model\ResourceModel\Indexer\Stock\Grouped::class => null,
         Magento\Elasticsearch\Model\Adapter\BatchDataMapper\DataMapperResolver::class => null,
         Magento\Elasticsearch\Model\Adapter\Elasticsearch::class => null,
+        Magento\Elasticsearch8\Model\Client\Elasticsearch::class => null,
         Magento\Tax\Model\TaxClass\Source\Product::class => null,
         Magento\Framework\View\TemplateEnginePool::class => null,
         Magento\Framework\View\Element\Template\File\Resolver::class => null,