MAGETWO-46472: Prepare pull request - fix select custom options

Author: valdislav

app/code/Magento/Catalog/Model/Product/Option/Value.php

@@ -200,14 +200,7 @@ public function saveValues()
                 'store_id',
                 $this->getOption()->getStoreId()
             );
-
-            if ($this->getData('option_type_id') == '-1') {
-                //change to 0
-                $this->unsetData('option_type_id');
-            } else {
-                $this->setId($this->getData('option_type_id'));
-            }
-
+            $this->unsetData('option_type_id');
             if ($this->getData('is_delete') == '1') {
                 if ($this->getId()) {
                     $this->deleteValues($this->getId());

app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Collection.php

@@ -210,9 +210,7 @@ public function addValuesToResult($storeId = null)
             foreach ($values as $value) {
                 $optionId = $value->getOptionId();
                 if ($this->getItemById($optionId)) {
-                    // @TODO fix with new storing mechanizm
                     $this->getItemById($optionId)->addValue($value);
-                    $value->setId(null);
                     $value->setOption($this->getItemById($optionId));
                 }
             }