Merge branch 'ACQE-4067' into functional-testing-automation

Author: Manjusha.S

app/code/Magento/Checkout/Test/Mftf/Test/CustomerOrderSimpleProductTest.xml

@@ -19,7 +19,7 @@
             <group value="shoppingCart"/>
         </annotations>
         <before>
-        
+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
             <!-- create category -->
             <createData entity="_defaultCategory" stepKey="testCategory"/>
             <!-- create data -->

app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontZeroPriceProductWithDiscountUsingCartPriceRuleTest.xml

@@ -19,6 +19,7 @@
             <group value="SalesRule"/>
         </annotations>
         <before>
+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
             <!-- Log in -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
             <!-- Create 2 simple products -->