Merge remote-tracking branch 'origin/MQE-472' into sprint-develop

# Conflicts:
#	dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_set-meta.xml
#	dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Metadata/coupon-meta.xml
#	dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/CreateSalesRuleByApiCest.xml

Author: jilu1

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/salesRuleData.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SimpleSalesRule" type="SalesRule">
+        <data key="name" unique="suffix">SalesRule</data>
+        <data key="is_active">true</data>
+        <required-entity type="SalesRuleStoreLabel">SalesRuleStoreLabel1</required-entity>
+        <required-entity type="SalesRuleStoreLabel">SalesRuleStoreLabel2</required-entity>
+    </entity>
+    <entity name="SalesRuleStoreLabel1" type="SalesRuleStoreLabel">
+        <data key="store_id">0</data>
+        <data key="store_label">TestRule_Label</data>
+    </entity>
+    <entity name="SalesRuleStoreLabel2" type="SalesRuleStoreLabel">
+        <data key="store_id">1</data>
+        <data key="store_label">TestRule_Label_default</data>
+    </entity>
+</config>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Cest/UpdateSimpleProductByApiCest.xml

@@ -25,7 +25,7 @@
             <updateData mergeKey="updateProduct" entity="NewSimpleProduct" createDataKey="productHandle"/>
         </before>
         <after>
-            <deleteData mergeKey="delete" createDataKey="productHandle"/>
+            <deleteData mergeKey="delete" createDataKey="updateProduct"/>
         </after>
         <test name="UpdateSimpleProductByApiTest">
         </test>