Merge branch 'MAGETWO-83424-Graph-Ql-Custom-Attributes' of https://github.com/magento-honey-badgers/magento2ce into MAGETWO-83424-Graph-Ql-Custom-Attributes

Author: dthampy

app/code/Magento/GraphQlCatalog/Model/Resolver/Products/DataProvider/Product/Formatter/ProductDataGetter.php renamed to app/code/Magento/GraphQlCatalog/Model/Resolver/Products/DataProvider/Product/Formatter/BaseModelData.php

@@ -12,7 +12,7 @@
 /**
  * Grabs the data from the product
  */
-class ProductDataGetter implements FormatterInterface
+class BaseModelData implements FormatterInterface
 {
     /**
      * Get data from product

app/code/Magento/GraphQlCatalog/etc/graphql/di.xml

@@ -60,7 +60,7 @@
     <type name="Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\FormatterComposite">
         <arguments>
             <argument name="formatterInstances" xsi:type="array">
-                <item name="productDataGetter" xsi:type="object">Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter\ProductDataGetter</item>
+                <item name="baseModelData" xsi:type="object">Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter\BaseModelData</item>
                 <item name="customAttributes" xsi:type="object">Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter\CustomAttributes</item>
                 <item name="entityIdToId" xsi:type="object">Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter\EntityIdToId</item>
                 <item name="mediaGalleryEntries" xsi:type="object">\Magento\GraphQlCatalog\Model\Resolver\Products\DataProvider\Product\Formatter\MediaGalleryEntries</item>