MAGETWO-92409: [Jenkins] MFTF Failures After Merge

- Update Button Item tests to use shared/correct selectors

Author: tjwiebell

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

@@ -621,7 +621,7 @@
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
         <!-- Validate Stage After Save -->
         <comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
-        <waitForElementVisible selector="{{ButtonItemOnStage.base('1')}}[@style='cursor: text;']" stepKey="waitForDefaultButtonOnStage"/>
+        <waitForElementVisible selector="{{ButtonItemOnStage.defaultStyle('1')}}" stepKey="waitForButtonItemStage2"/>
         <!-- Validate Edit Panel After Save -->
         <comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
@@ -657,7 +657,7 @@
         <actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
             <argument name="contentBlockType" value="PageBuilderButtonsContentBlock"/>
         </actionGroup>
-        <waitForElementVisible selector="{{ButtonItemOnStorefront.base('1')}}[@style='display: inline-block;']" stepKey="waitForDefaultButtonOnStorefront"/>
+        <waitForElementVisible selector="{{ButtonItemOnStorefront.defaultStyle('1')}}" stepKey="waitForButtonItemStorefront"/>
     </test>
     <test name="ButtonItemUpdateAdvancedConfigurationValues">
         <annotations>