Merge remote-tracking branch 'origin/MC-11438' into MC-11438

# Conflicts:
#	app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml

Author: mkovdrysh

app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml

@@ -271,16 +271,6 @@
         <requiredEntity type="address">US_Address_TX</requiredEntity>
         <requiredEntity type="address">US_Address_NY_Not_Default_Address</requiredEntity>
     </entity>
-    <entity name="John_Smith_Customer" type="customer">
-        <data key="group_id">1</data>
-        <data key="email" unique="prefix">john.smith@example.com</data>
-        <data key="firstname">John</data>
-        <data key="lastname">Smith</data>
-        <data key="fullname">John Smith</data>
-        <data key="password">pwdTest123!</data>
-        <data key="store_id">0</data>
-        <data key="website_id">0</data>
-    </entity>
     <entity name="Simple_US_Customer_Incorrect_Email" type="customer">
         <data key="group_id">0</data>
         <data key="default_billing">true</data>
@@ -294,4 +284,14 @@
         <data key="website_id">0</data>
         <requiredEntity type="address">US_Address_CA</requiredEntity>
     </entity>
+    <entity name="John_Smith_Customer" type="customer">
+        <data key="group_id">1</data>
+        <data key="email" unique="prefix">john.smith@example.com</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Smith</data>
+        <data key="fullname">John Smith</data>
+        <data key="password">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+    </entity>
 </entities>