Merge pull request #360 from magento-mpi/MPI-PR-2.1

Fixed issues:
 - MAGETWO-57460: [Backport] - Exception occurs when tracking shipment with invalid FedEx tracking number - for 2.1.x
- MAGETWO-57097: [Backport] Issue with fetching shipping charges based on city for 2.1.x
 - MAGETWO-56952: [Backport] Issue with get active payment methods (getActiveMethods) for 2.1.x
 - MAGETWO-56940: [Backport] Kount and 3D Secure doesn't work for Braintree Vault for 2.1.x

Author: Oleksii Korshenko

app/code/Magento/Braintree/view/frontend/web/js/view/payment/adapter.js

@@ -76,6 +76,11 @@ define([
             globalMessageList.addErrorMessage({
                 message: errorMessage
             });
-        }
+        },
+
+        /**
+         * May be triggered on Braintree SDK setup
+         */
+        onReady: function () {}
     };
 });

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js

@@ -68,6 +68,7 @@ define(
                      */
                     onReady: function (checkout) {
                         braintree.checkout = checkout;
+                        braintree.onReady();
                     },
 
                     /**
@@ -198,6 +199,7 @@ define(
                     onReady: function (checkout) {
                         braintree.checkout = checkout;
                         this.additionalData['device_data'] = checkout.deviceData;
+                        braintree.onReady();
                     }
                 };
 

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js

@@ -36,6 +36,7 @@ define([
                 onReady: function (checkout) {
                     Braintree.checkout = checkout;
                     this.enableButton();
+                    Braintree.onReady();
                 },
 
                 /**

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/vault.js

@@ -8,9 +8,10 @@ define([
     'jquery',
     'Magento_Braintree/js/view/payment/method-renderer/cc-form',
     'Magento_Vault/js/view/payment/method-renderer/vault',
+    'Magento_Braintree/js/view/payment/adapter',
     'Magento_Ui/js/model/messageList',
     'Magento_Checkout/js/model/full-screen-loader'
-], function ($, Component, VaultComponent, globalMessageList, fullScreenLoader) {
+], function ($, Component, VaultComponent, Braintree, globalMessageList, fullScreenLoader) {
     'use strict';
 
     return VaultComponent.extend({
@@ -49,7 +50,17 @@ define([
          * Place order
          */
         placeOrder: function () {
-            this.getPaymentMethodNonce();
+            var self = this;
+
+            /**
+             * Define on ready callback
+             */
+            Braintree.onReady = function () {
+                self.getPaymentMethodNonce();
+            };
+            self.hostedFields(function (formComponent) {
+                formComponent.initBraintree();
+            });
         },
 
         /**

app/code/Magento/Dhl/view/frontend/web/js/model/shipping-rates-validation-rules.js

@@ -16,6 +16,9 @@ define(
                     },
                     'country_id': {
                         'required': true
+                    },
+                    'city': {
+                        'required': true
                     }
                 };
             }