Merge branch 'features/JAL-2360colourSchemeApplicability' into features/JAL-2371colle...

diff --combined src/jalview/appletgui/SeqPanel.java
index 78cb0a7,1debda8..c1cddaa
--- 1/src/jalview/appletgui/SeqPanel.java
--- 2/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@@ -1505,12 -1505,12 +1505,12 @@@ public class SeqPanel extends Panel imp
  
        if (av.getConservationSelected())
        {
 -        SliderPanel.setConservationSlider(ap, av.getGlobalColourScheme(),
 +        SliderPanel.setConservationSlider(ap, av.getViewportColourScheme(),
                  "Background");
        }
        if (av.getAbovePIDThreshold())
        {
 -        SliderPanel.setPIDSliderSource(ap, av.getGlobalColourScheme(),
 +        SliderPanel.setPIDSliderSource(ap, av.getViewportColourScheme(),
                  "Background");
        }
  
@@@ -1538,7 -1538,7 +1538,7 @@@
          SliderPanel.setConservationSlider(ap, stretchGroup.cs,
                  stretchGroup.getName());
        }
-       else
+       if (stretchGroup.cs.getThreshold() > 0)
        {
          SliderPanel.setPIDSliderSource(ap, stretchGroup.cs,
                  stretchGroup.getName());