Merge commit 'refs/pull/12/head' of https://github.com/magento/magento2ce into epam-4

Author: Andrey Konosov

.gitignore

@@ -31,6 +31,8 @@ atlassian*
 !/pub/media/customer/.htaccess
 /pub/media/downloadable/*
 !/pub/media/downloadable/.htaccess
+/pub/media/import/*
+!/pub/media/import/.htaccess
 /pub/media/theme/*
 /pub/media/theme_customization/*
 !/pub/media/theme_customization/.htaccess

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

@@ -73,7 +73,7 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
     ];
 
     /**
-     * Template array for export data
+     * Export template
      *
      * @var array
      */

app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

@@ -62,6 +62,13 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
         ValidatorInterface::ERROR_GROUP_PRICE_DATA_INCOMPLETE => 'Group Price data is incomplete',
     ];
 
+    /**
+     * Need to log in import history
+     *
+     * @var bool
+     */
+    protected $logInHistory = true;
+
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceFactory
      */
@@ -133,6 +140,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
 
     /**
      * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param \Magento\ImportExport\Helper\Data $importExportData
      * @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
@@ -141,7 +149,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
      * @param \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceFactory $resourceFactory
      * @param \Magento\Catalog\Model\Product $productModel
      * @param \Magento\Catalog\Helper\Data $catalogData
-     * @param \Magento\CatalogImportExport\Model\Import\Product\StoreResolver $storeResolver
+     * @param ImportProduct\StoreResolver $storeResolver
      * @param ImportProduct $importProduct
      * @param AdvancedPricing\Validator $validator
      * @param AdvancedPricing\Validator\Website $websiteValidator