Merge remote-tracking branch 'remotes/mainline/1.0.0-release' into MC-5373

Author: danmooney2

app/code/Magento/PageBuilder/Test/Mftf/Test/CheckStaticBlocksTest.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="CheckStaticBlocksTest">
+        <before>
+            <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
+        </after>
+    </test>
+</tests>

app/code/Magento/PageBuilder/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontSwatchAttributesDisplayInWidgetCMSTest">
+        <before>
+            <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
+        </after>
+    </test>
+</tests>

app/code/Magento/PageBuilder/composer.json

@@ -17,9 +17,6 @@
         "magento/module-directory": "*",
         "php": "~7.1.3||~7.2.0"
     },
-    "suggest": {
-        "magento/module-page-builder-data-migration": "*"
-    },
     "conflict": {
         "gene/bluefoot": "*"
     },