Merge branch 'MAGETWO-51314' into develop

Author: RuslanKostiv1

app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php

@@ -144,13 +144,13 @@ public function addValueSortToCollection($collection, $dir = \Magento\Framework\
         $linkField = $attribute->getEntity()->getLinkField();
         $collection->getSelect()->joinLeft(
             [$valueTable1 => $attribute->getBackend()->getTable()],
-            "e.entity_id={$valueTable1}." . $linkField .
+            "e.{$linkField}={$valueTable1}." . $linkField .
             " AND {$valueTable1}.attribute_id='{$attribute->getId()}'" .
             " AND {$valueTable1}.store_id=0",
             []
         )->joinLeft(
             [$valueTable2 => $attribute->getBackend()->getTable()],
-            "e.entity_id={$valueTable2}." . $linkField .
+            "e.{$linkField}={$valueTable2}." . $linkField .
             " AND {$valueTable2}.attribute_id='{$attribute->getId()}'" .
             " AND {$valueTable2}.store_id='{$collection->getStoreId()}'",
             []