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

 - Fixed the build failures.

Author: devarul

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

@@ -232,8 +232,9 @@ protected function _saveAttributeValue($object, $attribute, $value)
         $select = $connection->select()->from($table, ['value_id', 'value'])->where($where);
         $origRow = $connection->fetchRow($select);
         $origValueId = $origRow['value_id'] ?? false;
+        $storeIds = $this->_storeManager->getStore($storeId)->getWebsite()->getStoreIds(true);
 
-        if ($origValueId > 0) {
+        if ($origValueId > 0 && count($storeIds) === 1) {
             $data->setData('value_id', $origValueId);
         }
 
@@ -248,7 +249,6 @@ protected function _saveAttributeValue($object, $attribute, $value)
             /**
              * Update attribute value for website
              */
-            $storeIds = $this->_storeManager->getStore($storeId)->getWebsite()->getStoreIds(true);
             foreach ($storeIds as $storeId) {
                 $bind['store_id'] = (int) $storeId;
                 $this->_attributeValuesToSave[$table][] = $bind;