MC-18487: Merge release branch into 2.2-develop

- Fixed unit test for MC-18282

Author: Rrego6

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml

@@ -73,6 +73,7 @@
 
     <!-- Save product but do not expect a success message -->
     <actionGroup name="SaveProductFormNoSuccessCheck" extends="saveProductForm">
+        <remove keyForRemoval="waitProductSaveSuccessMessage"/>
         <remove keyForRemoval="seeSaveConfirmation"/>
     </actionGroup>
 

app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithInvalidDomainLinkUrlTest.xml

@@ -26,7 +26,8 @@
             <argument name="index" value="0"/>
         </actionGroup>
         <actionGroup ref="SaveProductFormNoSuccessCheck" stepKey="saveProduct"/>
-        <see selector="{{AdminProductMessagesSection.errorMessage}}" userInput="Link URL's domain is not in list of downloadable_domains in env.php." stepKey="seeLinkUrlInvalidMessage" after="saveProduct" />
+        <waitForElementVisible selector="{{AdminMessagesSection.errorMessage}}" stepKey="waitForLinkUrlInvalidMessage" after="saveProduct"/>
+        <see selector="{{AdminProductMessagesSection.errorMessage}}" userInput="Link URL's domain is not in list of downloadable_domains in env.php." stepKey="seeLinkUrlInvalidMessage" after="waitForLinkUrlInvalidMessage" />
         <magentoCLI stepKey="addDownloadableDomain2" command="downloadable:domains:add static.magento.com" after="seeLinkUrlInvalidMessage" />
         <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillDownloadableProductFormAgain" after="addDownloadableDomain2">
             <argument name="product" value="DownloadableProduct"/>