Merge pull request magento#1498 from magento-engcom/develop-prs

[EngCom] Public Pull Requests
 - MAGETWO-75328: getCacheTags for price issue magento#10930

Author: ishakhsuvarov

app/code/Magento/Catalog/Block/Category/Plugin/PriceBoxTags.php

@@ -102,8 +102,8 @@ private function getTaxRateIds(PriceBox $subject)
 
         if (!empty($billingAddress) || !empty($shippingAddress)) {
             $rateRequest = $this->getTaxCalculation()->getRateRequest(
-                $billingAddress,
                 $shippingAddress,
+                $billingAddress,
                 $customerTaxClassId,
                 $this->scopeResolver->getScope()->getId(),
                 $this->customerSession->getCustomerId()

app/code/Magento/Catalog/Test/Unit/Block/Category/Plugin/PriceBoxTagsTest.php

@@ -119,8 +119,8 @@ public function testAfterGetCacheKey()
         $this->session->expects($this->once())->method('getCustomerId')->willReturn($customerId);
         $rateRequest = $this->getMockBuilder(\Magento\Framework\DataObject::class)->getMock();
         $this->taxCalculation->expects($this->once())->method('getRateRequest')->with(
-            new \Magento\Framework\DataObject($billingAddress),
             new \Magento\Framework\DataObject($shippingAddress),
+            new \Magento\Framework\DataObject($billingAddress),
             $customerTaxClassId,
             $scopeId,
             $customerId