Merge remote-tracking branch 'trigger/AC-1487' into AC-1390

Author: xmav

app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCommentsTabSection.xml

@@ -9,8 +9,8 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminOrderCommentsTabSection">
-        <element name="orderNotesList" type="text" selector="#Order_History .edit-order-comments .note-list"/>
-        <element name="orderComments" type="text" selector="#Order_History .edit-order-comments-block"/>
-        <element name="orderComment" type="text" selector="#Order_History .comments-block-item-comment"/>
+        <element name="orderNotesList" type="text" selector="div[aria-labelledby='sales_order_view_tabs_order_history'] .edit-order-comments .note-list"/>
+        <element name="orderComments" type="text" selector="div[aria-labelledby='sales_order_view_tabs_order_history'] .edit-order-comments-block"/>
+        <element name="orderComment" type="text" selector="div[aria-labelledby='sales_order_view_tabs_order_history'] .comments-block-item-comment"/>
     </section>
 </sections>