ACP2E-1522: Auto increment number jumping up for catalog_product_entity_* tables

 - Fixed the integration and web api test build failure.

Author: devarul

app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php

@@ -229,13 +229,17 @@ protected function _saveAttributeValue($object, $attribute, $value)
             $whereArr[] = $connection->quoteInto($field . '=?', $value);
         }
         $where = implode(' AND ', $whereArr);
-        $select = $connection->select()->from($table, ['value_id', 'value'])->where($where);
+        $select = $connection->select()->from($table, ['value_id', 'value', 'store_id'])->where($where);
         $origRow = $connection->fetchRow($select);
         $origValueId = $origRow['value_id'] ?? false;
+        $origStoreId = (int) $origRow['store_id'] ?? 0;
         $storeIds = $this->_storeManager->getStore($storeId)->getWebsite()->getStoreIds(true);
 
         if ($origValueId > 0 && count($storeIds) === 1) {
             $data->setData('value_id', $origValueId);
+            if ($storeId !== $origStoreId) {
+                $data->setData('store_id', $origStoreId);
+            }
         }
 
         $bind = $this->_prepareDataForTable($data, $table);