Merge remote-tracking branch 'origin/develop' into features/JAL-2388hiddencolumnschanges

diff --cc src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
Simple merge

diff --cc src/jalview/io/JSONFile.java
Simple merge

diff --cc test/jalview/io/JSONFileTest.java
index 957343b,4e4abe9..81d0ef7
--- 1/test/jalview/io/JSONFileTest.java
--- 2/test/jalview/io/JSONFileTest.java
+++ b/test/jalview/io/JSONFileTest.java
@@@ -191,9 -194,9 +194,9 @@@ public class JSONFileTes
      TEST_SEQ_HEIGHT = expectedSeqs.size();
      TEST_GRP_HEIGHT = expectedGrps.size();
      TEST_ANOT_HEIGHT = expectedAnnots.size();
 -    TEST_CS_HEIGHT = expectedColSel.getHiddenColumns().size();
 +    TEST_CS_HEIGHT = expectedColSel.getListOfCols().size();
  
-     AlignExportSettingI exportSettings = new AlignExportSettingI()
+     exportSettings = new AlignExportSettingI()
      {
        @Override
        public boolean isExportHiddenSequences()