Merge remote-tracking branch 'origin/MC-34482-Vasyltsun' into MC-34482

# Conflicts:
#	app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
#	app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml
#	app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml

Author: zakdma

app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml

@@ -28,7 +28,8 @@
                 <requiredEntity createDataKey="createAttributeSet"/>
             </createData>
 
-            <magentoCron stepKey="runCron"/>
+            <magentoCLI command="cron:run" arguments="--group index" stepKey="cronRun"/>
+            <magentoCLI command="cron:run" arguments="--group index" stepKey="cronRunToStartReindex"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
@@ -48,12 +49,10 @@
         <!-- Export created below products -->
         <actionGroup ref="ExportAllProductsActionGroup" stepKey="exportCreatedProducts"/>
 
-        <magentoCron stepKey="runCronIndex" groups="index"/>
-
-        <wait stepKey="waitForReindexing" time="60" />
+        <!-- Start message queue for export consumer -->
+        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
         <reloadPage stepKey="pageReload" />
         <waitForPageLoad stepKey="waitForPageLoaded" />
-
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
 
         <!-- Download product -->