Merge remote-tracking branch 'magento-engcom-team/forwardport-2.3-develop-magento-magento2-12283' into batch-21-forwardport-2.3-develop

# Conflicts:
#	dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_attributes_rollback.php

Author: Oleksii Korshenko

dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multistore.php

@@ -21,6 +21,9 @@
     4
 )->setStoreId(
     1
+)->setCustomAttribute(
+    'tax_class_id',
+    1
 )->setWebsiteIds(
     [1]
 )->setName(

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_attributes_rollback.php

@@ -8,7 +8,7 @@
 
 $attributeCodes = [
     'test_attribute',
-    ];
+];
 
 foreach ($attributeCodes as $attributeCode) {
     /** @var \Magento\Eav\Model\Entity\Attribute $attribute */