Merge remote-tracking branch 'origin/MAGETWO-49517' into MPI-BUGFIXES

Author: Viktor Tymchynskyi

app/code/Magento/Dhl/Model/Carrier.php

@@ -1123,9 +1123,8 @@ protected function _parseResponse($response)
                     throw new \Magento\Framework\Exception\LocalizedException($responseError);
                 }
                 $this->debugErrors($this->_errors);
-
-                return false;
             }
+            $result->append($this->getErrorMessage());
         }
 
         return $result;

app/code/Magento/Fedex/Model/Carrier.php

@@ -501,7 +501,10 @@ protected function _getQuotes()
         // make general request for all methods
         $response = $this->_doRatesRequest(self::RATE_REQUEST_GENERAL);
         $preparedGeneral = $this->_prepareRateResponse($response);
-        if (!$preparedGeneral->getError() || $this->_result->getError() && $preparedGeneral->getError()) {
+        if (!$preparedGeneral->getError()
+            || $this->_result->getError() && $preparedGeneral->getError()
+            || empty($this->_result->getAllRates())
+        ) {
             $this->_result->append($preparedGeneral);
         }