Merge branch 'develop' into feature/JAL-3576intervalStore_1_2

diff --cc test/jalview/datamodel/features/FeatureStoreTest.java
Simple merge

diff --cc test/jalview/io/vcf/VCFLoaderTest.java
index c8dd8f0,2b418de..ca10b55
--- 1/test/jalview/io/vcf/VCFLoaderTest.java
--- 2/test/jalview/io/vcf/VCFLoaderTest.java
+++ b/test/jalview/io/vcf/VCFLoaderTest.java
@@@ -5,17 -25,8 +25,18 @@@ import static org.testng.Assert.assertE
  import static org.testng.Assert.assertNull;
  import static org.testng.Assert.assertTrue;
  
 +import java.io.File;
 +import java.io.IOException;
 +import java.io.PrintWriter;
 +import java.util.List;
 +import java.util.Map;
 +
 +import org.testng.annotations.BeforeClass;
 +import org.testng.annotations.BeforeTest;
 +import org.testng.annotations.Test;
 +
  import jalview.bin.Cache;
+ import jalview.bin.Console;
  import jalview.datamodel.AlignmentI;
  import jalview.datamodel.DBRefEntry;
  import jalview.datamodel.Mapping;