Merge remote-tracking branch 'remotes/mainline/1.1-develop' into PB-61

Author: danmooney2

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

@@ -12,7 +12,7 @@
             <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="loginGetFromGeneralFile"/>
         </before>
         <after>
-            <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" before="amOnLogoutPage"/>
+            <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" before="adminLogout"/>
         </after>
     </test>
      <test name="AdminAddImageToCMSPageTinyMCE3Test">