Merge remote-tracking branch 'origin/AC-7572' into Hammer_Regression_issues_04Jan22

Author: glo71317

app/code/Magento/Elasticsearch8/Test/Mftf/Test/StorefrontQuickSearchUsingElasticSearch8ByProductSkuTest.xml

@@ -21,9 +21,11 @@
             <group value="pr_exclude"/>
         </annotations>
         <before>
+            <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="setSearchEngine"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <actionGroup ref="DeleteAllProductsUsingProductGridActionGroup" stepKey="deleteAllProductsAfterTest"/>
+            <actionGroup ref="DeleteAllProductsUsingProductGridActionGroup" stepKey="deleteAllProducts"/>
             <createData entity="VirtualProduct" stepKey="createVirtualProduct"/>
+            <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="createFirtsSimpleProduct"/>
             <createData entity="SimpleProductWithCustomSku24MB06" stepKey="createSecondSimpleProduct"/>
             <createData entity="SimpleProductWithCustomSku24MB04" stepKey="createThirdSimpleProduct"/>
             <createData entity="SimpleProductWithCustomSku24MB02" stepKey="createFourthSimpleProduct"/>
@@ -34,6 +36,7 @@
             <magentoCron groups="index" stepKey="reindex"/>
         </before>
         <after>
+            <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="deleteProductOne"/>
             <actionGroup ref="DeleteAllProductsUsingProductGridActionGroup" stepKey="deleteAllProductsAfterTest"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminPanel"/>
         </after>