Merge branch 'releases/Release_2_10_4_Branch' into develop

diff --cc src/jalview/gui/AquaInternalFrameManager.java
index 829135b,956c119..537ec17
--- 1/src/jalview/gui/AquaInternalFrameManager.java
--- 2/src/jalview/gui/AquaInternalFrameManager.java
+++ b/src/jalview/gui/AquaInternalFrameManager.java
@@@ -253,4 -254,4 +254,4 @@@ public class AquaInternalFrameManager e
    {
      switchFrame(false);
    }
--}
++}

diff --cc test/jalview/gui/SeqCanvasTest.java
index 05b9aea,fb48fdb..51fa5ce
--- 1/test/jalview/gui/SeqCanvasTest.java
--- 2/test/jalview/gui/SeqCanvasTest.java
+++ b/test/jalview/gui/SeqCanvasTest.java
@@@ -9,10 -9,10 +9,8 @@@ import jalview.io.FileLoader
  import java.awt.Font;
  import java.awt.FontMetrics;
  
- import junit.extensions.PA;
- 
  import org.testng.annotations.Test;
  
 -import junit.extensions.PA;
 -
  public class SeqCanvasTest
  {
    /**