Merge branch 2.2-develop into ENGCOM-5030-magento-magento2-22180

Author: magento-engcom-team

app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml

@@ -14,7 +14,7 @@
           method="post"
           id="form-validate"
           data-mage-init='{"Magento_Checkout/js/action/update-shopping-cart":
-              {"validationURL" : "/checkout/cart/updateItemQty",
+              {"validationURL" : "<?= /* @escapeNotVerified */ $block->getUrl('checkout/cart/updateItemQty') ?>",
               "updateCartActionContainer": "#update_cart_action_container"}
           }'
           class="form form-cart">

app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php

@@ -64,6 +64,7 @@ public function requestToken(Quote $quote)
         $request->setTrxtype(Payflowpro::TRXTYPE_AUTH_ONLY);
         $request->setVerbosity('HIGH');
         $request->setAmt(0);
+        $request->setCurrency($quote->getBaseCurrencyCode());
         $request->setCreatesecuretoken('Y');
         $request->setSecuretokenid($this->mathRandom->getUniqueHash());
         $request->setReturnurl($this->url->getUrl('paypal/transparent/response'));