ACQE-8709: Mainline deployment PR

- Resolved conflicts

Author: Karishmathakare19

app/code/Magento/Bundle/Test/Mftf/Test/AdminCreateAndEditBundleProductSettingsTest.xml

@@ -142,12 +142,6 @@
         <!-- Assert Gift Option product settings  -->
         <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCart"/>
         <dontSeeElement selector="{{StorefrontProductCartGiftOptionSection.giftOptions}}" stepKey="dontSeeGiftOptionBtn"/>
-
-        <!-- Delete created bundle product -->
-        <actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteProduct">
-            <argument name="product" value="BundleProduct"/>
-        </actionGroup>
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
     </test>
 </tests>
 

app/code/Magento/Reports/Test/Mftf/Test/AdminLowStockProductTest.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-/**
- * Copyright 2024 Adobe
- * All Rights Reserved.
- */
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -23,8 +23,8 @@
         </before>
         <after>
             <magentoCLI command="config:set cataloginventory/item_options/notify_stock_qty 1" stepKey="checkSystemValue1"/>
-            <deleteData createDataKey="createCategory" stepKey="deletecreateCategory"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deletecreateCategory"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Go to Inventory configuration page -->