Merge remote-tracking branch 'origin/MQE-1477' into mtf-eol-pr

Author: tomreece

app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml

@@ -16,7 +16,6 @@
             <description value="Admin should be able to add image to WYSIWYG content of Block"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-84376"/>
-            <group value="WYSIWYGDisabled" />
         </annotations>
         <before>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage" />

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

@@ -17,7 +17,6 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-94229"/>
             <group value="Cms"/>
-            <group value="WYSIWYGDisabled"/>
         </annotations>
         <before>
             <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>