MAGETWO-69717: Custom option value IDs changed after import

Author: Alex Paliarush

app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php

@@ -383,8 +383,8 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $dateTime
      * @param ProcessingErrorAggregatorInterface $errorAggregator
-     * @param ProductOptionValueCollectionFactory $productOptionValueCollectionFactory
      * @param array $data
+     * @param ProductOptionValueCollectionFactory $productOptionValueCollectionFactory
      * @throws \Magento\Framework\Exception\LocalizedException
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -402,8 +402,8 @@ public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $dateTime,
         ProcessingErrorAggregatorInterface $errorAggregator,
-        ProductOptionValueCollectionFactory $productOptionValueCollectionFactory = null,
-        array $data = []
+        array $data = [],
+        ProductOptionValueCollectionFactory $productOptionValueCollectionFactory = null
     ) {
         $this->_resource = $resource;
         $this->_catalogData = $catalogData;

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/OptionTest.php

@@ -305,8 +305,8 @@ protected function setUp()
                 '',
                 false
             ),
-            $optionValueCollectionFactoryMock,
-            $this->_getModelDependencies($addExpectations, $deleteBehavior, $doubleOptions)
+            $this->_getModelDependencies($addExpectations, $deleteBehavior, $doubleOptions),
+            $optionValueCollectionFactoryMock
         ];
 
         $modelClassName = \Magento\CatalogImportExport\Model\Import\Product\Option::class;