Merge 26.3 to 26.4

Author: labkey-teamcity

src/org/labkey/test/components/labkey/PortalTab.java

@@ -222,7 +222,7 @@ static public Locator.XPathLocator tabIdLoc(String tabText)
         }
 
         static public Locator.XPathLocator container = Locator.tagWithClass("ul", "lk-nav-tabs");
-        static public Locator.XPathLocator tabItem = Locator.xpath("//li[@role='presentation']");
+        static public Locator.XPathLocator tabItem = Locator.xpath("/li");
         static public Locator.XPathLocator subContainerTabSelect = Locator.tagWithAttribute("select", "title", "subContainerTabs");
 
         static public Locator.XPathLocator tabList = container.append(tabItem);

src/org/labkey/test/util/PortalHelper.java

@@ -87,7 +87,7 @@ public void moveTab(@LoggedParam String tabText, @LoggedParam Direction directio
             throw new IllegalArgumentException("Can't move folder tabs vertically.");
 
         String tabId = tabText.replace(" ", "") + "Tab";
-        Locator.XPathLocator tabList = Locator.xpath("//ul[contains(@class, 'lk-nav-tabs-admin')]//li[@role='presentation']");
+        Locator.XPathLocator tabList = Locator.xpath("//ul[contains(@class, 'lk-nav-tabs-admin')]/li");
         Locator.XPathLocator tabLink = Locator.xpath("//a[@id=" + Locator.xq(tabId) + "]");
 
         int tabCount = getElementCount(tabList) - 1;