Merge branch 'develop' into features/JAL-2446NCList

diff --combined src/jalview/gui/AlignFrame.java
index 162d100,f4dd851..8a59a4b
--- 1/src/jalview/gui/AlignFrame.java
--- 2/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@@ -2442,6 -2442,7 +2442,6 @@@ public class AlignFrame extends GAlignF
      viewport.setSelectionGroup(null);
      viewport.getColumnSelection().clear();
      viewport.setSelectionGroup(null);
 -    alignPanel.getSeqPanel().seqCanvas.highlightSearchResults(null);
      alignPanel.getIdPanel().getIdCanvas().searchResults = null;
      // JAL-2034 - should delegate to
      // alignPanel to decide if overview needs
@@@ -3324,7 -3325,7 +3324,7 @@@
       * 'User Defined' opens a panel to configure or load a
       * user-defined colour scheme
       */
-     if (ResidueColourScheme.USER_DEFINED.equals(name))
+     if (ResidueColourScheme.USER_DEFINED_MENU.equals(name))
      {
        new UserDefinedColours(alignPanel);
        return;