Merge remote-tracking branch 'origin/MAGETWO-51172' into MPI-BUGFIXES

Author: viktym

app/code/Magento/Eav/Model/Entity/AbstractEntity.php

@@ -35,7 +35,7 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
     /**
      * @var \Magento\Eav\Model\Entity\AttributeLoaderInterface
      */
-    private $attributeLoader;
+    protected $attributeLoader;
 
     /**
      * Connection name
@@ -1859,7 +1859,7 @@ protected function _isAttributeValueEmpty(AbstractAttribute $attribute, $value)
      *
      * @deprecated
      */
-    private function getAttributeLoader()
+    protected function getAttributeLoader()
     {
         if ($this->attributeLoader === null) {
             $this->attributeLoader= ObjectManager::getInstance()->get(AttributeLoaderInterface::class);