Merge remote-tracking branch 'origin/MAGETWO-40136' into MAGETWO-35251

Author: Valeriy Nayda

app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js

@@ -74,8 +74,8 @@ define([
                         $('body').trigger(self.options.processStop);
                     }
 
-                    if (res.redirect) {
-                        window.location = res.redirect;
+                    if (res.backUrl) {
+                        window.location = res.backUrl;
                         return;
                     }
                     if (res.messages) {

app/code/Magento/Checkout/Controller/Cart/Add.php

@@ -169,7 +169,7 @@ protected function goBack($backUrl = null, $product = null)
         $result = [];
 
         if ($backUrl || $backUrl = $this->getBackUrl()) {
-            $result['redirect'] = $backUrl;
+            $result['backUrl'] = $backUrl;
         } else {
             if ($product && !$product->getIsSalable()) {
                 $result['product'] = [

app/code/Magento/Customer/view/frontend/web/js/customer-data.js

@@ -134,7 +134,7 @@ define([
             var sections = sectionConfig.getAffectedSections(settings.url);
             if (sections) {
                 customerData.invalidate(sections);
-                var redirects = ['redirect'];
+                var redirects = ['redirect', 'backUrl'];
                 if (_.isObject(xhr.responseJSON) && !_.isEmpty(_.pick(xhr.responseJSON, redirects))) {
                     return ;
                 }