MC-15776: Merge release branch into 2.3-develop

- fix MFTF test

Author: krissyhiserote

app/code/Magento/Email/Test/Mftf/Test/TransactionalEmailsLogoUploadTest.xml

@@ -21,6 +21,8 @@
         <!--Login to Admin Area-->
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <!--Logout from Admin Area-->
         <after>