Merge 24.3 to 24.7

Author: labkey-teamcity

ehr/test/src/org/labkey/test/pages/ehr/NotificationAdminPage.java

@@ -111,12 +111,11 @@ public void clickManuallyTriggerEmail(String name)
 
     public void addManageUsers(String notification, String user)
     {
-        log("Adding " + user + "to" + notification);
-        notification = notification.replace(" ", "");
-        notification = "manageUser_" + notification;
-        clickAndWait(Locator.tagWithAttributeContaining("a", "id", notification).withText("Manage Subscribed Users/Groups"), 0);
+        log("Adding " + user + " to" + notification);
+        notification = "manageUser_" +  notification.replace(" ", "");
+        Locator notificationLoc = Locator.tagWithAttributeContaining("a", "id", notification).withText("Manage Subscribed Users/Groups");
+        scrollIntoView(waitForElement(notificationLoc)).click();
         _ext4Helper.selectComboBoxItem("Add User Or Group:", user);
         clickButton("Close", 0);
-
     }
 }