Merge branch 'MAGETWO-31593' of https://github.corp.ebay.com/magento-firedrakes/magento2ce into MAGETWO-31593

Author: Vladyslav Shcherbyna

dev/tools/Magento/Tools/Di/Code/Scanner/RepositoryScanner.php

@@ -34,10 +34,12 @@ public function collectEntities(array $files)
                     if (!class_exists($replacementType->nodeValue)) {
                         $persistor = str_replace('\\Repository', 'InterfacePersistor', $replacementType->nodeValue);
                         $factory = str_replace('\\Repository', 'InterfaceFactory', $replacementType->nodeValue);
+                        $dataBuilder = str_replace('\\Repository', 'DataBuilder', $replacementType->nodeValue);
                         $searchResultFactory
                             = str_replace('\\Repository', 'SearchResultInterfaceFactory', $replacementType->nodeValue);
                         $repositoryClassNames[$persistor] = $persistor;
                         $repositoryClassNames[$factory] = $factory;
+                        $repositoryClassNames[$dataBuilder] = $dataBuilder;
                         $repositoryClassNames[$searchResultFactory] = $searchResultFactory;
                         $repositoryClassNames[$replacementType->nodeValue] = $replacementType->nodeValue;
                     }