MAGETWO-61120: Tax and Order total not correct when discount is applied

Author: Alex Paliarush

app/code/Magento/Tax/Model/System/Message/Notification/ApplyDiscountOnPrices.php

@@ -82,7 +82,7 @@ public function getText()
 
         if ($this->isDisplayed()) {
             $messageDetails .= '<strong>';
-            $messageDetails .= __('To apply the discount on prices including tax and apply the tax after discount, set Catalog Prices to “Including Price”. ');
+            $messageDetails .= __('To apply the discount on prices including tax and apply the tax after discount, set Catalog Prices to “Including Tax”. ');
             $messageDetails .= '</strong><p>';
             $messageDetails .= __('Store(s) affected: ');
             $messageDetails .= implode(', ', $this->getStoresWithWrongSettings());

app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/ApplyDiscountOnPricesTest.php

@@ -151,7 +151,7 @@ public function testGetText()
         $this->applyDiscountOnPricesNotification->isDisplayed();
         $this->assertEquals(
             '<strong>To apply the discount on prices including tax and apply the tax after discount, '
-            . 'set Catalog Prices to “Including Price”. </strong><p>Store(s) affected: testWebsiteName '
+            . 'set Catalog Prices to “Including Tax”. </strong><p>Store(s) affected: testWebsiteName '
             . '(testStoreName)</p><p>Click on the link to '
             . '<a href="http://example.com">ignore this notification</a></p>',
             $this->applyDiscountOnPricesNotification->getText()