Merge branch 'port-2689' of github.com:magento-mpi/magento2ce into port-2689

Author: iivashchenko

app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php

@@ -451,6 +451,8 @@ protected function _updateFreeMethodQuote($request)
                     }
                 }
             }
+        } else {
+            $price = 0;
         }
 
         /**

dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Ups\Model;
 
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Quote\Model\Quote\Address\RateRequestFactory;
+
 class CarrierTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -14,7 +17,7 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->carrier = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $this->carrier = Bootstrap::getObjectManager()->create(
             \Magento\Ups\Model\Carrier::class
         );
     }