ACP2E-209: "Table rate" shipping method displays as "Not yet calculated" on checkout

Code fixed as per CR comments and discussion. Static test failures fixed.

Author: rajan-adobe

app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php

@@ -133,8 +133,7 @@ public function collectRates(RateRequest $request)
                             $freeQty += $item->getQty() * ($child->getQty() - $freeShipping);
                         }
                     }
-                } elseif (
-                    ($item->getFreeShipping() || $item->getAddress()->getFreeShipping()) &&
+                } elseif (($item->getFreeShipping() || $item->getAddress()->getFreeShipping()) &&
                     ($item->getFreeShippingMethod() == null || $item->getFreeShippingMethod() &&
                     $item->getFreeShippingMethod() == 'tablerate_bestway')
                 ) {
@@ -194,7 +193,7 @@ public function collectRates(RateRequest $request)
              * Free package weight has been already taken into account.
              */
             $request->setPackageValue($freePackageValue);
-            $request->setPackageValueWithDiscount($freePackageValue - $request->getPackageValueWithDiscount());
+            $request->setPackageValueWithDiscount($freePackageValue);
             $request->setPackageQty($freeQty);
             $rate = $this->getRate($request);
             if (!empty($rate) && $rate['price'] >= 0) {