Merge remote-tracking branch 'origin/MAGETWO-44795' into BUGS

Author: slavvka

app/code/Magento/CustomerImportExport/etc/import.xml

@@ -9,4 +9,7 @@
     <entity name="customer_composite" label="Customers and Addresses (single file)" model="Magento\CustomerImportExport\Model\Import\CustomerComposite" behaviorModel="Magento\ImportExport\Model\Source\Import\Behavior\Basic" />
     <entity name="customer" label="Customers Main File" model="Magento\CustomerImportExport\Model\Import\Customer" behaviorModel="Magento\ImportExport\Model\Source\Import\Behavior\Custom" />
     <entity name="customer_address" label="Customer Addresses" model="Magento\CustomerImportExport\Model\Import\Address" behaviorModel="Magento\ImportExport\Model\Source\Import\Behavior\Custom" />
+    <relatedIndexer entity="customer" name="customer_grid" />
+    <relatedIndexer entity="customer_address" name="customer_grid" />
+    <relatedIndexer entity="customer_composite" name="customer_grid" />
 </config>

app/code/Magento/ImportExport/Model/Import/Config/Reader.php

@@ -15,7 +15,7 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
     protected $_idAttributes = [
         '/config/entity' => 'name',
         '/config/entityType' => ['entity', 'name'],
-        '/config/relatedIndexers' => ['entity', 'name'],
+        '/config/relatedIndexer' => ['entity', 'name'],
     ];
 
     /**