Merge branch '2.4-develop' of https://github.com/magento-gl/magento2ce into BUG#AC-2567

Author: glo80326

app/code/Magento/AdvancedSearch/README.md

@@ -7,7 +7,7 @@ The Magento_AdvancedSearch module introduces advanced search functionality and p
 Before disabling or uninstalling this module, note that the following modules depends on this module:
 
 - Magento_Elasticsearch
-- Magento_Elasticsearch6
+- Magento_Elasticsearch7
 
 For information about module installation in Magento 2, see [Enable or disable modules](https://devdocs.magento.com/guides/v2.4/install-gde/install/cli/install-cli-subcommands-enable.html).
 

app/code/Magento/CatalogInventory/Test/Fixture/SourceItem.php

@@ -567,4 +567,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Customer\Model\EmailNotificationInterface">
+        <plugin name="saveWishlistDataAndAddReferenceKeyToBackUrl" type="Magento\Wishlist\Plugin\SaveWishlistDataAndAddReferenceKeyToBackUrl"/>
+    </type>
 </config>

app/code/Magento/Customer/etc/di.xml

@@ -10,10 +10,10 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontElasticSearchForChineseLocaleTest">
         <annotations>
-            <features value="Elasticsearch6"/>
-            <stories value="Elasticsearch6 for Chinese"/>
-            <title value="Elastic search for Chinese locale"/>
-            <description value="Elastic search for Chinese locale"/>
+            <features value="CatalogSearch"/>
+            <stories value="Search for Chinese"/>
+            <title value="Storefront Search for Chinese locale"/>
+            <description value="Storefront Search for Chinese locale"/>
             <severity value="BLOCKER"/>
             <testCaseId value="MC-6310"/>
             <useCaseId value="MAGETWO-91625"/>

app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticSearchForChineseLocaleTest.xml renamed to app/code/Magento/Elasticsearch/Test/Mftf/Test/StorefrontElasticSearchForChineseLocaleTest.xml

@@ -10,7 +10,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontElasticsearchSearchInvalidValueTest">
         <annotations>
-            <features value="Elasticsearch6"/>
+            <features value="CatalogSearch"/>
             <stories value="Search Product on Storefront"/>
             <title value="Elasticsearch: try to search by invalid value of 'Searchable' attribute"/>
             <description value="Elasticsearch: try to search by invalid value of 'Searchable' attribute"/>

app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearchSearchInvalidValueTest.xml renamed to app/code/Magento/Elasticsearch/Test/Mftf/Test/StorefrontElasticsearchSearchInvalidValueTest.xml

@@ -542,6 +542,7 @@
         <arguments>
             <argument name="excludedEngineList" xsi:type="array">
                 <item name="elasticsearch" xsi:type="string">Elasticsearch 2</item>
+                <item name="elasticsearch6" xsi:type="string">Elasticsearch 6</item>
             </argument>
             <argument name="engineValidators" xsi:type="array">
                 <item name="elasticsearch5" xsi:type="object">Magento\Elasticsearch\Setup\Validator</item>