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

Author: okarpenko

app/code/Magento/Customer/Model/Resource/Customer/Grid/ServiceCollection.php

@@ -10,7 +10,7 @@
     <preference for="Magento\Framework\Mview\View\StateInterface" type="Magento\Indexer\Model\Mview\View\State" />
     <preference for="Magento\Framework\Indexer\ConfigInterface" type="Magento\Indexer\Model\Config" />
     <preference for="Magento\Framework\Indexer\IndexerInterface" type="Magento\Indexer\Model\Indexer" />
-    <preference for="Magento\Framework\Indexer\Table\StrategyInterface" type="Magento\Indexer\Model\Indexer\Table\Strategy" />
+    <preference for="Magento\Framework\Indexer\Table\StrategyInterface" type="Magento\Framework\Indexer\Table\Strategy" />
     <type name="Magento\Framework\Indexer\Table\StrategyInterface" shared="false" />
     <type name="Magento\Indexer\Model\Indexer">
         <arguments>

app/code/Magento/Indexer/etc/di.xml

@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Indexer\Test\Unit\Model\Indexer\Table;
+namespace Magento\Framework\Indexer\Test\Unit\Table;
 
 /**
  * Class StrategyTest