Merge discvr-21.11 to develop

Author: bbimber

LDK/test/src/org/labkey/test/util/external/labModules/LabModuleHelper.java

@@ -95,6 +95,8 @@ public void clickNavPanelItem(String label, String itemText)
     {
         Locator l = getNavPanelItem(label, itemText);
         _test.waitForElement(l);
+        Assert.assertEquals("Incorrect number of elements: " + label + "/" + itemText, l.findElements(_test.getDriver()).size(), 1);
+
         _test.waitAndClick(l);
     }
 
@@ -260,7 +262,7 @@ public void goToAssayResultImport(String assayName, boolean supportsTemplates)
     @LogMethod(quiet = true)
     public String clickAndGetExampleData()
     {
-        Locator btn = Locator.linkContainingText("Download Example Data");
+        Locator btn = Ext4Helper.Locators.ext4ButtonEnabled("Download Example Data");
         String currentWindow = _test.getDriver().getWindowHandle();
         _test.waitForElement(btn);
         _test.waitAndClick(btn);