Merge remote-tracking branch 'origin/MAGETWO-71185' into MPI-PR-2.1-develop

Author: viktym

dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Payment/GetClientTokenTest.php

@@ -122,7 +122,7 @@ private function perform($merchantId, $publicKey, $privateKey)
         ];
 
         $adapter = $this->getMockBuilder(BraintreeAdapter::class)
-            ->setConstructorArgs($args)
+            ->setConstructorArgs(array_merge(['config' => null], $args))
             ->setMethods(['generate'])
             ->getMock();
         $adapter->method('generate')