Merge branch 'MAGETWO-85781-2' into 2.1.13-PR-0.5

Author: dhorytskyi

app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php

@@ -753,7 +753,7 @@ private function getCategoryIds($productId)
     {
         if (!isset($this->categoryIdList[$productId])) {
             $this->categoryIdList[$productId] = $this->_productResource->getConnection()->fetchCol(
-                $this->getCategorySelect($productId, $this->category->getCategoryProductTable())
+                $this->getCategorySelect($productId)
             );
         }
 
@@ -764,13 +764,12 @@ private function getCategoryIds($productId)
      * Returns DB select.
      *
      * @param int $productId
-     * @param string $tableName
      * @return Select
      */
-    private function getCategorySelect($productId, $tableName)
+    private function getCategorySelect($productId)
     {
         return $this->_productResource->getConnection()->select()->from(
-            $tableName,
+            $this->category->getCategoryProductTable(),
             ['category_id']
         )->where(
             'product_id = ?',