Merge remote-tracking branch 'remotes/github/MC-15140-V2' into EPAM-PR-69

Author: VeronikaYarats

app/code/Magento/Paypal/Test/Mftf/ActionGroup/OtherPayPalConfigurationActionGroup.xml

@@ -28,7 +28,7 @@
         <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
     </actionGroup>
-    <actionGroup name="EnablePayPalSolution" >
+    <actionGroup name="EnablePayPalSolutionWithoutSave" >
         <annotations>
             <description>Expands the 'OTHER PAYPAL PAYMENT SOLUTIONS' tab on the Admin Configuration page. Enables the provided PayPal Config type for the provided Country Code without saving.</description>
         </annotations>

app/code/Magento/Paypal/Test/Mftf/Test/AdminOnePayPalSolutionsEnabledAtTheSameTimeTest.xml

@@ -39,13 +39,13 @@
         <!--Try to enable express checkout Solution-->
         <comment userInput="Try to enable express checkout Solution" stepKey="commentTryEnableExpressCheckout"/>
         <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
-        <actionGroup ref="EnablePayPalSolution" stepKey="enableExpressCheckout">
+        <actionGroup ref="EnablePayPalSolutionWithoutSave" stepKey="enableExpressCheckout">
             <argument name="payPalConfigType" value="WPSExpressConfigSection"/>
             <argument name="countryCode" value="us"/>
         </actionGroup>
         <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
-        <actionGroup ref="EnablePayPalSolution" stepKey="enableExpressCheckout2">
+        <actionGroup ref="EnablePayPalSolutionWithoutSave" stepKey="enableExpressCheckout2">
             <argument name="payPalConfigType" value="PayPalExpressCheckoutConfigSection"/>
             <argument name="countryCode" value="us"/>
         </actionGroup>