MC-18487: Merge release branch into 2.2-develop

- Fixed conflicts in files non composer files
- Updated version of mftf framework in composer.json

Author: Rrego6

app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml

@@ -150,7 +150,7 @@
         <fillField selector="{{AdminCatalogPriceRuleActionsSection.discountAmount}}" userInput="{{catalogRule.discount_amount}}" stepKey="fillDiscountValue"/>
         <selectOption selector="{{AdminCatalogPriceRuleActionsSection.disregardRules}}" userInput="Yes" stepKey="discardSubsequentRules"/>
     </actionGroup>
-    
+
     <actionGroup name="AdminFillCatalogRuleConditionActionGroup">
         <arguments>
             <argument name="condition" type="string"/>

app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php

@@ -11,7 +11,6 @@
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Api\CartRepositoryInterface;
-use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Model\Quote;
 
 /**
@@ -132,6 +131,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             $this->_eventManager->dispatch('persistent_session_expired');
             $this->quoteManager->expire();
             $this->_checkoutSession->clearQuote();
+            $this->_customerSession->setCustomerId(null)->setCustomerGroupId(null);
             return;
         }
 
@@ -156,7 +156,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
      */
     private function isPersistentQuoteOutdated(): bool
     {
-        if (!$this->_persistentData->isEnabled() && !$this->_customerSession->isLoggedIn()
+        if ((!$this->_persistentData->isEnabled() || !$this->_persistentData->isShoppingCartPersist())
+            && !$this->_customerSession->isLoggedIn()
             && $this->_checkoutSession->getQuoteId()
             && $this->isActiveQuote()
         ) {

app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceTest.xml

@@ -52,8 +52,9 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!--Open order by Id-->
-        <actionGroup ref="OpenOrderById" stepKey="openOrderById">
+        <actionGroup ref="OpenOrderByName" stepKey="openOrderById">
             <argument name="orderId" value="$createGuestCart.return$"/>
+            <argument name="orderName" value="{{ShippingAddressTX.fullname}}"/>
         </actionGroup>
         <!--Reorder-->
         <click selector="{{AdminOrderDetailsMainActionsSection.reorder}}" stepKey="clickReorder"/>

composer.json

@@ -76,7 +76,7 @@
     },
     "require-dev": {
         "allure-framework/allure-phpunit": "~1.2.0",
-        "magento/magento2-functional-testing-framework": "2.4.5",
+        "magento/magento2-functional-testing-framework": "2.5.0",
         "phpunit/phpunit": "~6.2.0",
         "squizlabs/php_codesniffer": "3.2.2",
         "phpmd/phpmd": "@stable",