From 1dc27c1bd245402a894035e52ff53f02dc329451 Mon Sep 17 00:00:00 2001
From: Devagouda Patil <depatil@Devagoudas-MacBook-Pro.local>
Date: Wed, 19 Dec 2018 13:00:14 +0530
Subject: [PATCH 1/7] MC-5593: [Modularity] Braintree module MFTF contain wide
 used sections and action groups - Moved/updated files and deleted some to
 remove deplication

---
 .../Test/Mftf/Section/AdminMenuSection.xml    |  6 ++++
 .../AdminOrderBraintreeFillActionGroup.xml    |  2 +-
 .../ConfigureBraintreeActionGroup.xml         |  2 +-
 .../Mftf/Section/AdminEditRoleInfoSection.xml | 21 --------------
 .../Mftf/Section/AdminEditUserRoleSection.xml | 17 -----------
 .../Mftf/Section/AdminEditUserSection.xml     | 28 -------------------
 .../Test/Mftf/Section/AdminMenuSection.xml    | 23 ---------------
 .../Mftf/Section/AdminRoleGridSection.xml     | 17 -----------
 .../Section/BraintreeConfiguraionSection.xml  |  3 +-
 .../Section/ConfigurationPaymentSection.xml   |  4 +--
 .../Mftf/Section/StoresSubmenuSection.xml     | 14 ----------
 .../CreateNewProductActionGroup.xml           |  4 +--
 .../ActionGroup/DeleteProductActionGroup.xml  |  2 +-
 .../Test/Mftf/Data/NewProductData.xml         |  2 +-
 .../Mftf/Section/CatalogSubmenuSection.xml    |  2 +-
 .../Mftf/Section/NewProductPageSection.xml    |  2 +-
 .../Test/Mftf/Section/ProductsPageSection.xml |  2 +-
 .../ActionGroup/CreateCustomerActionGroup.xml |  2 +-
 .../ActionGroup/DeleteCustomerActionGroup.xml |  0
 .../ActionGroup/SwitchAccountActionGroup.xml  |  3 +-
 .../Test/Mftf/Data/NewCustomerData.xml        |  2 +-
 .../Mftf/Section/AdminCreateUserSection.xml   |  3 +-
 .../Mftf/Section/AdminDeleteUserSection.xml   |  3 +-
 .../Mftf/Section/AdminUserGridSection.xml     |  3 +-
 .../Mftf/Section/CustomersPageSection.xml     |  2 +-
 .../Mftf/Section/CustomersSubmenuSection.xml  |  2 +-
 .../Mftf/Section/NewCustomerPageSection.xml   |  2 +-
 .../Mftf/Section/SwitchAccountSection.xml     |  3 +-
 .../ActionGroup/CreateNewOrderActionGroup.xml |  3 +-
 .../Mftf/Section/ConfigurationListSection.xml |  2 +-
 .../Test/Mftf/Section/NewOrderSection.xml     |  3 +-
 .../Mftf/ActionGroup/AdminTaxActionGroup.xml  |  8 +++---
 .../Mftf/Section/AdminCreateRoleSection.xml   |  3 +-
 .../Mftf/Section/AdminDeleteRoleSection.xml   |  5 ++--
 .../Mftf/Section/AdminEditUserSection.xml     |  6 +++-
 35 files changed, 50 insertions(+), 156 deletions(-)
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml
 rename app/code/Magento/{Braintree => Catalog}/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml (84%)
 rename app/code/Magento/{Braintree => Catalog}/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml (86%)
 rename app/code/Magento/{Braintree => Catalog}/Test/Mftf/Data/NewProductData.xml (66%)
 rename app/code/Magento/{Braintree => Catalog}/Test/Mftf/Section/CatalogSubmenuSection.xml (68%)
 rename app/code/Magento/{Braintree => Catalog}/Test/Mftf/Section/NewProductPageSection.xml (81%)
 rename app/code/Magento/{Braintree => Catalog}/Test/Mftf/Section/ProductsPageSection.xml (84%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml (94%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml (100%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml (85%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Data/NewCustomerData.xml (77%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/AdminCreateUserSection.xml (82%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/AdminDeleteUserSection.xml (69%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/AdminUserGridSection.xml (75%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/CustomersPageSection.xml (84%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/CustomersSubmenuSection.xml (68%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/NewCustomerPageSection.xml (92%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/SwitchAccountSection.xml (78%)
 rename app/code/Magento/{Braintree => Sales}/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml (90%)
 rename app/code/Magento/{Braintree => Sales}/Test/Mftf/Section/ConfigurationListSection.xml (72%)
 rename app/code/Magento/{Braintree => Sales}/Test/Mftf/Section/NewOrderSection.xml (90%)
 rename app/code/Magento/{Braintree => User}/Test/Mftf/Section/AdminCreateRoleSection.xml (84%)
 rename app/code/Magento/{Braintree => User}/Test/Mftf/Section/AdminDeleteRoleSection.xml (64%)

diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
index 9e4a6d9219526..30c3c4bbca3b3 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
@@ -16,5 +16,11 @@
         <element name="widgets" type="button" selector="#nav li[data-ui-id='menu-magento-widget-cms-widget-instance']"/>
         <element name="stores" type="button" selector="#menu-magento-backend-stores"/>
         <element name="configuration" type="button" selector="#nav li[data-ui-id='menu-magento-config-system-config']"/>
+        <element name="dashboard" type="button" selector="//li[@id='menu-magento-backend-dashboard']"/>
+        <element name="sales" type="button" selector="//li[@id='menu-magento-sales-sales']"/>
+        <element name="marketing" type="button" selector="//li[@id='menu-magento-backend-marketing']"/>
+        <element name="reports" type="button" selector="//li[@id='menu-magento-reports-report']"/>
+        <element name="system" type="button" selector="//li[@id='menu-magento-backend-system']"/>
+        <element name="findPartners" type="button" selector="//li[@id='menu-magento-marketplace-partners']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
index c2e6af9dcd735..eb909e967fb75 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
 
     <actionGroup name="AdminOrderBraintreeFillActionGroup">
         <!--Select Braintree Payment method on Admin Order Create Page-->
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml
index 9eaae8b33e73f..cbb065704fbc1 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml
@@ -12,7 +12,7 @@
         <!-- GoTo ConfigureBraintree fields -->
         <click stepKey="clickOnSTORES" selector="{{AdminMenuSection.stores}}"/>
         <waitForPageLoad stepKey="waitForConfiguration" time="2"/>
-        <click stepKey="clickOnConfigurations" selector="{{StoresSubmenuSection.configuration}}" />
+        <click stepKey="clickOnConfigurations" selector="{{AdminMenuSection.configuration}}" />
         <waitForPageLoad stepKey="waitForSales" time="2"/>
         <click stepKey="clickOnSales" selector="{{ConfigurationListSection.sales}}" />
         <waitForPageLoad stepKey="waitForPaymentMethods" time="2"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
deleted file mode 100644
index e37ce8f4738b3..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminEditRoleInfoSection">
-        <element name="roleName" type="input" selector="#role_name"/>
-        <element name="password" type="input" selector="#current_password"/>
-        <element name="roleResourcesTab" type="button" selector="#role_info_tabs_account"/>
-        <element name="backButton" type="button" selector="button[title='Back']"/>
-        <element name="resetButton" type="button" selector="button[title='Reset']"/>
-        <element name="deleteButton" type="button" selector="button[title='Delete Role']"/>
-        <element name="saveButton" type="button" selector="button[title='Save Role']"/>
-        <element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/>
-        <element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/>
-        <element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="60"/>
-    </section>
-</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
deleted file mode 100644
index e999413c96d74..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminEditUserRoleSection">
-        <element name="usernameTextField" type="input" selector="#user_username"/>
-        <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
-        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
-        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
-        <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
-        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-    </section>
-</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
deleted file mode 100644
index 2e5fcfb7b5c8d..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminEditUserSection">
-        <element name="system" type="input" selector="#menu-magento-backend-system"/>
-        <element name="allUsers" type="input" selector="//span[contains(text(), 'All Users')]"/>
-        <element name="create" type="input" selector="#add"/>
-        <element name="usernameTextField" type="input" selector="#user_username"/>
-        <element name="firstNameTextField" type="input" selector="#user_firstname"/>
-        <element name="lastNameTextField" type="input" selector="#user_lastname"/>
-        <element name="emailTextField" type="input" selector="#user_email"/>
-        <element name="passwordTextField" type="input" selector="#user_password"/>
-        <element name="pwConfirmationTextField" type="input" selector="#user_confirmation"/>
-        <element name="currentPasswordField" type="input" selector="#user_current_password"/>
-        <element name="userRoleTab" type="button" selector="#page_tabs_roles_section"/>
-        <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
-        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
-        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
-        <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
-        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-        <element name="saveButton" type="button" selector="#save"/>
-    </section>
-</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
deleted file mode 100644
index eb7a9ce2c376e..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminMenuSection">
-        <element name="dashboard" type="button" selector="//li[@id='menu-magento-backend-dashboard']"/>
-        <element name="sales" type="button" selector="//li[@id='menu-magento-sales-sales']"/>
-        <element name="catalog" type="button" selector="//li[@id='menu-magento-catalog-catalog']"/>
-        <element name="customers" type="button" selector="//li[@id='menu-magento-customer-customer']"/>
-        <element name="marketing" type="button" selector="//li[@id='menu-magento-backend-marketing']"/>
-        <element name="content" type="button" selector="//li[@id='menu-magento-backend-content']"/>
-        <element name="reports" type="button" selector="//li[@id='menu-magento-reports-report']"/>
-        <element name="stores" type="button" selector="//li[@id='menu-magento-backend-stores']"/>
-        <element name="system" type="button" selector="//li[@id='menu-magento-backend-system']"/>
-        <element name="findPartners" type="button" selector="//li[@id='menu-magento-marketplace-partners']"/>
-    </section>
-</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
deleted file mode 100644
index 63cbadc71d3d3..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminRoleGridSection">
-        <element name="idFilterTextField" type="input" selector="#roleGrid_filter_role_id"/>
-        <element name="roleNameFilterTextField" type="input" selector="#roleGrid_filter_role_name"/>
-        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
-        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
-        <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
-        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-    </section>
-</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
index 016af2e102744..98dc849644fe9 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
@@ -5,7 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="BraintreeConfiguraionSection">
         <element name="titleForBraintreeSettings" type="input" selector="//input[@id='payment_us_braintree_section_braintree_braintree_required_title']"/>
         <element name="environment" type="select" selector="//select[@id='payment_us_braintree_section_braintree_braintree_required_environment']"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
index 885a45be721f1..8632dc62cd19d 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
@@ -7,8 +7,8 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="ConfigurationPaymentSection">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+         <section name="ConfigurationPaymentSection">
         <element name="configureButton" type="button" selector="//button[@id='payment_us_braintree_section_braintree-head']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml
deleted file mode 100644
index f094baa9f3446..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="StoresSubmenuSection">
-        <element name="configuration" type="button" selector="//li[@id='menu-magento-backend-stores']//li[@data-ui-id='menu-magento-config-system-config']"/>
-    </section>
-</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
similarity index 84%
rename from app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
index 19de3e859ae9a..bad5eec86bc90 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
@@ -6,8 +6,8 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="CreateNewProductActionGroup">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+                 <actionGroup name="CreateNewProductActionGroup">
 
         <click stepKey="openCatalog" selector="{{AdminMenuSection.catalog}}"/>
         <waitForPageLoad stepKey="waitForCatalogSubmenu" time="5"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
similarity index 86%
rename from app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
index 724c6d92846c4..d6f9d03271f55 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="DeleteProductActionGroup">
         <arguments>
             <argument name="productName" defaultValue=""/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/NewProductData.xml
similarity index 66%
rename from app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml
rename to app/code/Magento/Catalog/Test/Mftf/Data/NewProductData.xml
index 72661ae94076f..ff13217cbcb53 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/NewProductData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="NewProductData" type="braintree_config_state">
         <data key="ProductName">ProductTest</data>
         <data key="Price">100</data>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/CatalogSubmenuSection.xml
similarity index 68%
rename from app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/CatalogSubmenuSection.xml
index 32f02a69f817e..84a81c5204acc 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/CatalogSubmenuSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CatalogSubmenuSection">
         <element name="products" type="button" selector="//li[@id='menu-magento-catalog-catalog']//li[@data-ui-id='menu-magento-catalog-catalog-products']"/>
     </section>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/NewProductPageSection.xml
similarity index 81%
rename from app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/NewProductPageSection.xml
index 42e451940c91b..b98bd47b54132 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/NewProductPageSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="NewProductPageSection">
         <element name="productName" type="input" selector="//input[@name='product[name]']"/>
         <element name="sku" type="input" selector="//input[@name='product[sku]']"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/ProductsPageSection.xml
similarity index 84%
rename from app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/ProductsPageSection.xml
index 267efdf3d0e5e..6cf56f7baacae 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/ProductsPageSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ProductsPageSection">
         <element name="addProductButton" type="button" selector="//button[@id='add_new_product-button']"/>
         <element name="checkboxForProduct" type="button" selector="//*[contains(text(),'{{args}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']" parameterized="true"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
similarity index 94%
rename from app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
rename to app/code/Magento/Customer/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
index a68042127ec48..de24616b8adc9 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="CreateCustomerActionGroup">
         <click stepKey="openCustomers" selector="{{AdminMenuSection.customers}}"/>
         <waitForAjaxLoad stepKey="waitForCatalogSubmenu" time="5"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
similarity index 100%
rename from app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
rename to app/code/Magento/Customer/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
similarity index 85%
rename from app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
rename to app/code/Magento/Customer/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
index 7c774a634b369..c3963f3dbef97 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
@@ -6,8 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!--Sign out-->
     <actionGroup name="SignOut">
         <click selector="{{SignOutSection.admin}}" stepKey="clickToAdminProfile"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/NewCustomerData.xml
similarity index 77%
rename from app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml
rename to app/code/Magento/Customer/Test/Mftf/Data/NewCustomerData.xml
index 30345ec31bacd..9c1e7c48a74a2 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/NewCustomerData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="NewCustomerData" type="braintree_config_state">
         <data key="FirstName">Abgar</data>
         <data key="LastName">Abgaryan</data>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCreateUserSection.xml
similarity index 82%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminCreateUserSection.xml
index 98d748b5a30ea..9eaf0ae33d15b 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCreateUserSection.xml
@@ -5,7 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCreateUserSection">
         <element name="system" type="input" selector="#menu-magento-backend-system"/>
         <element name="allUsers" type="input" selector="//span[contains(text(), 'All Users')]"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml
similarity index 69%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml
index bf2e2b44eb602..af48b8f78216a 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml
@@ -5,7 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminDeleteUserSection">
         <element name="theUser" selector="//td[contains(text(), 'John')]" type="button"/>
         <element name="password" selector="#user_current_password" type="input"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminUserGridSection.xml
similarity index 75%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminUserGridSection.xml
index 9564bc61f799c..9f51822684254 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminUserGridSection.xml
@@ -5,7 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminUserGridSection">
         <element name="usernameFilterTextField" type="input" selector="#permissionsUserGrid_filter_username"/>
         <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/CustomersPageSection.xml
similarity index 84%
rename from app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/CustomersPageSection.xml
index e4a75b1b6a842..60c635387199a 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/CustomersPageSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CustomersPageSection">
         <element name="addNewCustomerButton" type="button" selector="//*[@id='add']"/>
         <element name="customerCheckbox" type="button" selector="//*[contains(text(),'{{args}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']" parameterized="true"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/CustomersSubmenuSection.xml
similarity index 68%
rename from app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/CustomersSubmenuSection.xml
index 937afb83da96f..6eeef1ba9daf0 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/CustomersSubmenuSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CustomersSubmenuSection">
         <element name="allCustomers" type="button" selector="//li[@id='menu-magento-customer-customer']//li[@data-ui-id='menu-magento-customer-customer-manage']"/>
     </section>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/NewCustomerPageSection.xml
similarity index 92%
rename from app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/NewCustomerPageSection.xml
index d302f9c7d0cba..db11f2d260b15 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/NewCustomerPageSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="NewCustomerPageSection">
         <element name="associateToWebsite" type="select" selector="//*[@class='admin__field-control _with-tooltip']//*[@class='admin__control-select']"/>
         <element name="group" type="select" selector="//div[@class='admin__field-control admin__control-fields required']//div[@class='admin__field-control']//select[@class='admin__control-select']"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/SwitchAccountSection.xml
similarity index 78%
rename from app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/SwitchAccountSection.xml
index 3a07cbc6dd145..e7655924133e1 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/SwitchAccountSection.xml
@@ -7,8 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="LoginFormSection">
         <element name="username" type="input" selector="#username"/>
         <element name="password" type="input" selector="#login"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
similarity index 90%
rename from app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
rename to app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
index 17d634c009b3e..93434471fe38f 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
@@ -6,8 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="useBraintreeForMasterCard">
         <click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
         <waitForPageLoad stepKey="waitForBraintreeConfigs" time="5"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/ConfigurationListSection.xml
similarity index 72%
rename from app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/ConfigurationListSection.xml
index 100407438eaae..bce5f95cf78a6 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/ConfigurationListSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ConfigurationListSection">
         <element name="sales" type="button" selector="//div[contains(@class, 'admin__page-nav-title title _collapsible')]/strong[text()='Sales']"/>
         <element name="salesPaymentMethods" type="button" selector="//span[text()='Payment Methods']"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/NewOrderSection.xml
similarity index 90%
rename from app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/NewOrderSection.xml
index 13f59ad2cf18e..cde46c1ad63e8 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/NewOrderSection.xml
@@ -5,7 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="NewOrderSection">
         <element name="createNewOrder" type="button" selector="#add"/>
         <element name="customer" type="button" selector="//td[contains(text(), 'Abgar')]"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
index b3395bd4afaa9..33b1db76d09db 100644
--- a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
@@ -128,12 +128,12 @@
         <!--Select Configuration menu from Store-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES" />
         <waitForPageLoad stepKey="waitForConfiguration" time="5"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations"/>
         <waitForPageLoad stepKey="waitForSales" time="5"/>
         <!--Double click the same to fix flaky issue with redirection to Dashboard-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES1" />
         <waitForPageLoad stepKey="waitForConfiguration1" time="5"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
         <waitForPageLoad stepKey="waitForSales1" time="5"/>
         <!--Change default tax class for Shipping on Taxable Goods-->
         <click selector="{{ConfigurationListSection.sales}}" stepKey="clickOnSales" />
@@ -156,12 +156,12 @@
         <!--Select Configuration menu from Store-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES" />
         <waitForPageLoad stepKey="waitForConfiguration" time="5"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations"/>
         <waitForPageLoad stepKey="waitForSales" time="5"/>
         <!--Double click the same to fix flaky issue with redirection to Dashboard-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES1" />
         <waitForPageLoad stepKey="waitForConfiguration1" time="5"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
         <waitForPageLoad stepKey="waitForSales1" time="5"/>
         <!--Change default tax class for Shipping on Taxable Goods-->
         <click selector="{{ConfigurationListSection.sales}}" stepKey="clickOnSales" />
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminCreateRoleSection.xml
similarity index 84%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
rename to app/code/Magento/User/Test/Mftf/Section/AdminCreateRoleSection.xml
index 1158f471d51f0..eb8344008794f 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminCreateRoleSection.xml
@@ -5,7 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCreateRoleSection">
         <element name="create" type="button" selector="#add"/>
         <element name="name" type="button" selector="#role_name"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
similarity index 64%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
rename to app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
index 220c9a444b02f..d3b19a3f00bcf 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
@@ -5,8 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminDeleteRoleSection">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+<section name="AdminDeleteRoleSection">
         <element name="theRole" selector="//td[contains(text(), 'Role')]" type="button"/>
         <element name="current_pass" type="button" selector="#current_password"/>
         <element name="delete" selector="//button/span[contains(text(), 'Delete Role')]" type="button"/>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
index 5b866b45e2fbe..64068a0a5ef58 100644
--- a/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
@@ -5,8 +5,12 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminEditUserSection">
+        <element name="system" type="input" selector="#menu-magento-backend-system"/>
+        <element name="allUsers" type="input" selector="//span[contains(text(), 'All Users')]"/>
+        <element name="create" type="input" selector="#add"/>
         <element name="usernameTextField" type="input" selector="#user_username"/>
         <element name="firstNameTextField" type="input" selector="#user_firstname"/>
         <element name="lastNameTextField" type="input" selector="#user_lastname"/>

From 60efe627c36390f68e130f0ceae87b1f6518bbc9 Mon Sep 17 00:00:00 2001
From: Devagouda Patil <depatil@ip-192-168-1-15.ec2.internal>
Date: Wed, 19 Dec 2018 19:30:02 +0530
Subject: [PATCH 2/7] MC-5593: [Modularity] Braintree module MFTF contain wide
 used sections and action groups - removed unwanted wait paramateres from
 waitForPageLoad

---
 .../CreateAnAdminOrderUsingBraintreePaymentTest1.xml   |  4 ++--
 .../Mftf/ActionGroup/CreateNewOrderActionGroup.xml     | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
index 2ddefa40b536c..35d03d69b662f 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
@@ -74,8 +74,8 @@
         <actionGroup ref="useBraintreeForMasterCard" stepKey="selectCardWithBraintree"/>
 
         <click stepKey="submitOrder" selector="{{NewOrderSection.submitOrder}}"/>
-        <waitForPageLoad stepKey="waitForSaveConfig" time="5"/>
-        <waitForElementVisible selector="{{NewOrderSection.successMessage}}" stepKey="waitForSuccessMessage" time="1"/>
+        <waitForPageLoad stepKey="waitForSaveConfig"/>
+        <waitForElementVisible selector="{{NewOrderSection.successMessage}}" stepKey="waitForSuccessMessage"/>
 
         <after>
             <!-- Disable BrainTree -->
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
index 93434471fe38f..2c549d5c01cf2 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
@@ -9,30 +9,26 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="useBraintreeForMasterCard">
         <click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
-        <waitForPageLoad stepKey="waitForBraintreeConfigs" time="5"/>
+        <waitForPageLoad stepKey="waitForBraintreeConfigs"/>
         <click stepKey="openCardTypes" selector="{{NewOrderSection.openCardTypes}}"/>
-        <waitForPageLoad stepKey="waitForCardTypes" time="3"/>
+        <waitForPageLoad stepKey="waitForCardTypes"/>
         <click stepKey="chooseCardType" selector="{{NewOrderSection.masterCard}}"/>
-        <waitForPageLoad stepKey="waitForCardSelected" time="3"/>
+        <waitForPageLoad stepKey="waitForCardSelected"/>
 
         <switchToIFrame stepKey="switchToCardNumber" selector="{{NewOrderSection.cardFrame}}"/>
         <fillField stepKey="fillCardNumber" selector="{{NewOrderSection.creditCardNumber}}" userInput="{{PaymentAndShippingInfo.cardNumber}}"/>
-        <waitForPageLoad stepKey="waitForFillCardNumber" time="1"/>
         <switchToIFrame stepKey="switchBackFromCard"/>
 
         <switchToIFrame stepKey="switchToExpirationMonth" selector="{{NewOrderSection.monthFrame}}"/>
         <fillField stepKey="fillMonth" selector="{{NewOrderSection.expirationMonth}}" userInput="{{PaymentAndShippingInfo.month}}"/>
-        <waitForPageLoad stepKey="waitForFillMonth" time="1"/>
         <switchToIFrame stepKey="switchBackFromMonth"/>
 
         <switchToIFrame stepKey="switchToExpirationYear" selector="{{NewOrderSection.yearFrame}}"/>
         <fillField stepKey="fillYear" selector="{{NewOrderSection.expirationYear}}" userInput="{{PaymentAndShippingInfo.year}}"/>
-        <waitForPageLoad stepKey="waitForFillYear" time="1"/>
         <switchToIFrame stepKey="switchBackFromYear"/>
 
         <switchToIFrame stepKey="switchToCVV" selector="{{NewOrderSection.cvvFrame}}"/>
         <fillField stepKey="fillCVV" selector="{{NewOrderSection.cvv}}" userInput="{{PaymentAndShippingInfo.cvv}}"/>
-        <wait stepKey="waitForFillCVV" time="1"/>
         <switchToIFrame stepKey="switchBackFromCVV"/>
     </actionGroup>
 </actionGroups>
\ No newline at end of file

From f13a71a3a585cbcc8698eb7a00a440a8f5b237c2 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Wed, 19 Dec 2018 15:57:10 -0600
Subject: [PATCH 3/7] MC-5545: RSS feed works only from cache

---
 .../Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php    | 6 +++---
 .../Test/Unit/Block/Adminhtml/Rss/NotifyStockTest.php      | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php b/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
index ac1fd8c692ed2..eb6da28d268f7 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
@@ -54,8 +54,8 @@ protected function _construct()
      */
     public function getRssData()
     {
-        $newUrl = $this->rssUrlBuilder->getUrl(['_secure' => true, '_nosecret' => true, 'type' => 'notifystock']);
-        $title = __('Low Stock Products');
+         $newUrl = $this->rssUrlBuilder->getUrl(['_secure' => true, '_nosecret' => true, 'type' => 'notifystock']);
+        $title = __('Low Stock Products')->render();
         $data = ['title' => $title, 'description' => $title, 'link' => $newUrl, 'charset' => 'UTF-8'];
 
         foreach ($this->rssModel->getProductsCollection() as $item) {
@@ -65,7 +65,7 @@ public function getRssData()
                 ['id' => $item->getId(), '_secure' => true, '_nosecret' => true]
             );
             $qty = 1 * $item->getQty();
-            $description = __('%1 has reached a quantity of %2.', $item->getName(), $qty);
+            $description = __('%1 has reached a quantity of %2.', $item->getName(), $qty)->render();
             $data['entries'][] = ['title' => $item->getName(), 'link' => $url, 'description' => $description];
         }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Rss/NotifyStockTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Rss/NotifyStockTest.php
index 1dd866f1fe2ca..da35d845468d5 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Rss/NotifyStockTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Rss/NotifyStockTest.php
@@ -96,7 +96,12 @@ public function testGetRssData()
         $this->urlBuilder->expects($this->once())->method('getUrl')
             ->with('catalog/product/edit', ['id' => 1, '_secure' => true, '_nosecret' => true])
             ->will($this->returnValue('http://magento.com/catalog/product/edit/id/1'));
-        $this->assertEquals($this->rssFeed, $this->block->getRssData());
+
+        $data = $this->block->getRssData();
+        $this->assertTrue(is_string($data['title']));
+        $this->assertTrue(is_string($data['description']));
+        $this->assertTrue(is_string($data['entries'][0]['description']));
+        $this->assertEquals($this->rssFeed, $data);
     }
 
     public function testGetCacheLifetime()

From 6d058a360315217b372e5b2da19ca1c45721df4f Mon Sep 17 00:00:00 2001
From: Devagouda Patil <depatil@ip-192-168-0-5.ec2.internal>
Date: Mon, 14 Jan 2019 12:31:51 -0600
Subject: [PATCH 4/7] MC-5593: [Modularity] Braintree module MFTF contain wide
 used sections and action groups - updated element location to use

---
 .../Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
index 596b72070bf7e..3986ede9acf63 100644
--- a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
@@ -128,12 +128,12 @@
         <!--Select Configuration menu from Store-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES" />
         <waitForPageLoad stepKey="waitForConfiguration"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations"/>
         <waitForPageLoad stepKey="waitForSales"/>
         <!--Double click the same to fix flaky issue with redirection to Dashboard-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES1" />
         <waitForPageLoad stepKey="waitForConfiguration1"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
         <waitForPageLoad stepKey="waitForSales1" time="5"/>
         <!--Change default tax class for Shipping on Taxable Goods-->
         <click selector="{{ConfigurationListSection.sales}}" stepKey="clickOnSales" />
@@ -156,12 +156,12 @@
         <!--Select Configuration menu from Store-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES" />
         <waitForPageLoad stepKey="waitForConfiguration"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations"/>
         <waitForPageLoad stepKey="waitForSales"/>
         <!--Double click the same to fix flaky issue with redirection to Dashboard-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES1" />
         <waitForPageLoad stepKey="waitForConfiguration1"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
         <waitForPageLoad stepKey="waitForSales1"/>
         <!--Change default tax class for Shipping on Taxable Goods-->
         <click selector="{{ConfigurationListSection.sales}}" stepKey="clickOnSales" />

From df3f8b06ebf3e410f5ecd38abfdc443377671ab1 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Mon, 14 Jan 2019 15:34:55 -0600
Subject: [PATCH 5/7] MC-10811:
 Magento\SalesRule\Test\TestCase\ApplySeveralSalesRuleEntityTest::testApplySeveralSalesRules
 with data set "ApplySeveralSalesRuleEntityTestVariation3" works wrong

---
 .../tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml   | 2 +-
 .../SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
index 521d7d68ac4a6..5cb5b4db72769 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
@@ -271,7 +271,7 @@
             <field name="coupon_type" xsi:type="string">No Coupon</field>
             <field name="sort_order" xsi:type="string">1</field>
             <field name="is_rss" xsi:type="string">Yes</field>
-            <field name="conditions_serialized" xsi:type="string">[Total Items Quantity|equals or greater than|3]{Product attribute combination|FOUND|ALL|:[[Category|is|2]]}</field>
+            <field name="conditions_serialized" xsi:type="string">[Total Items Quantity|equals or greater than|3]</field>
             <field name="simple_action" xsi:type="string">Percent of product price discount</field>
             <field name="discount_amount" xsi:type="string">25</field>
             <field name="apply_to_shipping" xsi:type="string">No</field>
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
index e160fef609545..3dfe4cf118552 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
@@ -31,7 +31,6 @@
             <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
         </variation>
         <variation name="ApplySeveralSalesRuleEntityTestVariation3" summary="Rules with different priority, both are applied">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="salesRules/rule1" xsi:type="string">active_sales_rule_product_attribute</data>
             <data name="salesRules/rule2" xsi:type="string">active_sales_total_items</data>
             <data name="cartPrice/sub_total" xsi:type="string">250.00</data>
@@ -44,7 +43,6 @@
             <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
         </variation>
         <variation name="ApplySeveralSalesRuleEntityTestVariation4" summary="Rules with different priority, none are applied">
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <data name="salesRules/rule1" xsi:type="string">active_sales_rule_row_total</data>
             <data name="salesRules/rule2" xsi:type="string">active_sales_total_items</data>
             <data name="productForSalesRule1/dataset" xsi:type="string">simple_for_salesrule_1</data>

From 13ab5eaa2c5229f87952ac2ce90e00ea718f6e3b Mon Sep 17 00:00:00 2001
From: Devagouda Patil <depatil@Devagoudas-MacBook-Pro.local>
Date: Tue, 22 Jan 2019 10:45:47 -0600
Subject: [PATCH 6/7] MC-5593: [Modularity] Braintree module MFTF contain wide
 used sections and action groups - removed duplicate entry of reports element

---
 app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
index 30c3c4bbca3b3..278a738b60f0f 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
@@ -19,7 +19,6 @@
         <element name="dashboard" type="button" selector="//li[@id='menu-magento-backend-dashboard']"/>
         <element name="sales" type="button" selector="//li[@id='menu-magento-sales-sales']"/>
         <element name="marketing" type="button" selector="//li[@id='menu-magento-backend-marketing']"/>
-        <element name="reports" type="button" selector="//li[@id='menu-magento-reports-report']"/>
         <element name="system" type="button" selector="//li[@id='menu-magento-backend-system']"/>
         <element name="findPartners" type="button" selector="//li[@id='menu-magento-marketplace-partners']"/>
     </section>

From 2640e04b1f7b4af259e66034395cb91a43aee792 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Tue, 22 Jan 2019 12:05:32 -0600
Subject: [PATCH 7/7] MC-5545: RSS feed works only from cache

---
 .../Catalog/Block/Adminhtml/Rss/NotifyStock.php     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php b/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
index eb6da28d268f7..c296a5aa0dbbd 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
@@ -9,6 +9,7 @@
 
 /**
  * Class NotifyStock
+ *
  * @package Magento\Catalog\Block\Adminhtml\Rss
  */
 class NotifyStock extends \Magento\Backend\Block\AbstractBlock implements DataProviderInterface
@@ -41,7 +42,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -50,7 +51,7 @@ protected function _construct()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getRssData()
     {
@@ -73,7 +74,7 @@ public function getRssData()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCacheLifetime()
     {
@@ -81,7 +82,7 @@ public function getCacheLifetime()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isAllowed()
     {
@@ -89,7 +90,7 @@ public function isAllowed()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFeeds()
     {
@@ -97,7 +98,7 @@ public function getFeeds()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isAuthRequired()
     {