ACQE-8228 Mainline Deployment PR

- Resolved conflicts of ACQE-7206

Author: Karishmathakare19

app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml

@@ -24,4 +24,9 @@
         <data key="label">Yes</data>
         <data key="value">mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter</data>
     </entity>
+    <entity name="WysiwygDisabled">
+        <data key="path">cms/wysiwyg/enabled</data>
+        <data key="scope_id">0</data>
+        <data key="value">hidden</data>
+    </entity>
 </entities>