Merge remote-tracking branch 'mainline/develop' into pr_into_develop

Author: Oleksandr Dubovyk

app/code/Magento/Customer/view/frontend/web/js/action/login.js

@@ -38,10 +38,10 @@ define([
                     });
                     customerData.invalidate(['customer']);
 
-                    if (redirectUrl) {
-                        window.location.href = redirectUrl;
-                    } else if (response.redirectUrl) {
+                    if (response.redirectUrl) {
                         window.location.href = response.redirectUrl;
+                    } else if (redirectUrl) {
+                        window.location.href = redirectUrl;
                     } else {
                         location.reload();
                     }

app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js

@@ -78,7 +78,9 @@ define(
                                     $('body').trigger('processStop');
                                     customerData.invalidate(['cart']);
                                 });
-                            }.bind(this));
+                            }.bind(this)).fail(function () {
+                                paypalExpressCheckout.checkout.closeFlow();
+                            });
                         }
                     }
                 }

dev/tests/unit/phpunit.xml.dist

@@ -14,8 +14,6 @@
         >
     <testsuite name="Magento Unit Tests">
         <directory suffix="Test.php">../../../app/code/*/*/Test/Unit</directory>
-        <directory suffix="Test.php">../../../dev/tools/*/*/Test/Unit</directory>
-        <directory suffix="Test.php">../../../dev/tools/*/*/*/Test/Unit</directory>
         <directory suffix="Test.php">../../../lib/internal/*/*/Test/Unit</directory>
         <directory suffix="Test.php">../../../lib/internal/*/*/*/Test/Unit</directory>
         <directory suffix="Test.php">../../../setup/src/*/*/Test/Unit</directory>

dev/tools/grunt/configs/watch.js

@@ -13,6 +13,9 @@ var themeOptions = {};
 
 _.each(themes, function(theme, name) {
     themeOptions[name] = {
+        'options': {
+            livereload: true
+        },
         'files': [
             '<%= combo.autopath(\''+name+'\', path.pub) %>/**/*.less'
         ],