Merge remote-tracking branch 'mainline/develop' into MAGETWO-38049

tomer was created on backend

- Fixed URL generation when used within a 'trans' directive

app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Row.php

@@ -33,7 +33,7 @@ class Row extends \Magento\CatalogInventory\Model\Indexer\Stock\AbstractAction
         try {
             $this->_reindexRows([$id]);
         } catch (\Exception $e) {
-            throw new \Magento\Framework\Exception\LocalizedException($e->getMessage(), $e->getCode(), $e);
+            throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);
         }
     }
 }

app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Rows.php

@@ -33,7 +33,7 @@ class Rows extends \Magento\CatalogInventory\Model\Indexer\Stock\AbstractAction
         try {
             $this->_reindexRows($ids);
         } catch (\Exception $e) {
-            throw new \Magento\Framework\Exception\LocalizedException($e->getMessage(), $e->getCode(), $e);
+            throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);
         }
     }
 }