MAGETWO-65466: [Backport] - Issue when deleting item from Product options grid containing more than 20 options - for 2.1

Author: Oleksandr Gorkun

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php

@@ -453,6 +453,7 @@ private function fillProductOptions(Product $product, array $productOptions)
                 continue;
             }
 
+            //Ignoring ID because front-end messes it up.
             $customOptionData['option_id'] = null;
             if (isset($customOptionData['values'])) {
                 $customOptionData['values'] = array_filter(

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php

@@ -293,10 +293,10 @@ private function assembleProductMock($links = [])
             ->method('create')
             ->willReturnMap([
                 [
-                    ['data' => $optionsData['option2']],
+                    ['data' => array_merge($optionsData['option2'], ['option_id' => null])],
                     $customOptionMockClone1->setData($optionsData['option2'])
                 ], [
-                    ['data' => $optionsData['option3']],
+                    ['data' => array_merge($optionsData['option3'], ['option_id' => null])],
                     $customOptionMockClone2->setData($optionsData['option3'])
                 ]
             ]);
@@ -719,9 +719,24 @@ private function assembleProductRepositoryMock($links)
     private function getOptionsData()
     {
         $optionsData = [
-            'option1' => ['is_delete' => true, 'name' => 'name1', 'price' => 'price1', 'option_id' => ''],
-            'option2' => ['is_delete' => false, 'name' => 'name1', 'price' => 'price1', 'option_id' => '13'],
-            'option3' => ['is_delete' => false, 'name' => 'name1', 'price' => 'price1', 'option_id' => '14'],
+            'option1' => [
+                'is_delete' => true,
+                'name'      => 'name1',
+                'price'     => 'price1',
+                'option_id' => '',
+            ],
+            'option2' => [
+                'is_delete' => false,
+                'name'      => 'name2',
+                'price'     => 'price1',
+                'option_id' => '13',
+            ],
+            'option3' => [
+                'is_delete' => false,
+                'name'      => 'name1',
+                'price'     => 'price1',
+                'option_id' => '14',
+            ],
         ];
 
         return $optionsData;