Merge remote-tracking branch 'origin/develop' into cms-team-1-delivery

Author: cspruiell

app/code/Magento/PageBuilder/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "magento/module-page-builder",
-    "description": "PageBuilder module",
+    "description": "Page Builder module",
     "require": {
         "magento/framework": "*",
         "magento/module-eav": "*",

app/code/Magento/PageBuilder/etc/adminhtml/di.xml

@@ -508,7 +508,7 @@
         <arguments>
             <argument name="editors" xsi:type="array">
                 <item name="mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" xsi:type="array">
-                    <item name="component" xsi:type="string">Magento_PageBuilder/js/content-type/wysiwyg/tinymce4</item>
+                    <item name="component" xsi:type="string">Magento_PageBuilder/js/wysiwyg/tinymce4</item>
                     <item name="component_initializers" xsi:type="array">
                         <item name="text" xsi:type="string">Magento_PageBuilder/js/content-type/text/wysiwyg/tinymce4/component-initializer</item>
                         <item name="slide" xsi:type="string">Magento_PageBuilder/js/content-type/slide/wysiwyg/tinymce4/component-initializer</item>

app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/button_item.xml

@@ -29,7 +29,7 @@
                         reader="Magento_PageBuilder/js/master-format/read/configurable">
                 <elements>
                     <element name="main">
-                        <style name="display" source="display" converter="Magento_PageBuilder/js/content-type/buttons/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
+                        <style name="display" source="display" converter="Magento_PageBuilder/js/content-type/button-item/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
                         <attribute name="name" source="data-role"/>
                         <attribute name="appearance" source="data-appearance"/>
                         <css name="css_classes"/>