Merge remote-tracking branch 'origin/MAGETWO-61006' into 2.3-develop-pr40

Author: zakdma

dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml

@@ -9,7 +9,6 @@
     <testCase name="Magento\Ui\Test\TestCase\GridSortingTest" summary="Grid UI Component Sorting" ticketId="MAGETWO-41328">
         <variation name="SalesOrderGridSorting">
             <data name="tag" xsi:type="string">severity:S2</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <data name="description" xsi:type="string">Verify sales order grid storting</data>
             <data name="steps" xsi:type="array">
                 <item name="0" xsi:type="string">-</item>

dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php

@@ -181,7 +181,7 @@ public function resetFilter()
      *
      * @return void
      */
-    protected function waitFilterToLoad()
+    public function waitFilterToLoad()
     {
         $this->getTemplateBlock()->waitLoader();
         $browser = $this->_rootElement;

dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridSortingTest.php

@@ -89,6 +89,7 @@ public function test(
         $page->open();
         /** @var DataGrid $gridBlock */
         $gridBlock = $page->$gridRetriever();
+        $gridBlock->waitFilterToLoad();
         $gridBlock->resetFilter();
 
         $sortingResults = [];