update after merge from develop

Author: cnathe

src/org/labkey/test/components/ui/grids/QueryGrid.java

@@ -720,15 +720,8 @@ public QueryGrid resetToDefaultState(boolean revertDefaultView)
 
     public QueryChartPanel showChart(String chartName)
     {
-        // if there was a different chart already shown, wait for it to close first
-        // NOTE: this will need to be updated soon with the changes for the "multiple chart rendering" feature
-        WebElement prevChart = hasChartPanel() ? getChartPanel().getSvgChart() : null;
-
         elementCache().chartsMenu.clickSubMenu(false, chartName);
-
-        if (prevChart != null)
-            getWrapper().shortWait().until(ExpectedConditions.stalenessOf(prevChart));
-        return getChartPanel();
+        return getChartPanel(chartName);
     }
 
     public QueryChartDialog createChart()
@@ -772,12 +765,6 @@ public QueryChartPanel getChartPanel(String name)
         return new QueryChartPanel.QueryChartPanelFinder(getDriver(), this, name).waitFor(this);
     }
 
-    public boolean hasChartPanel()
-    {
-        QueryChartPanel chartPanel = new QueryChartPanel.QueryChartPanelFinder(getDriver(), this).findOrNull(this);
-        return chartPanel != null;
-    }
-
     public WebElement showRReport(String reportName)
     {
         elementCache().chartsMenu.clickSubMenu(false, reportName);