Merge branch 'develop' into spike/JAL-1950_hmmer3client

diff --cc src/jalview/datamodel/AlignmentAnnotation.java
Simple merge

diff --cc src/jalview/gui/AlignViewport.java
Simple merge

diff --cc src/jalview/util/Comparison.java
Simple merge

diff --cc src/jalview/util/HttpUtils.java
index 769e15b,a5a9460..97c84bc
--- 1/src/jalview/util/HttpUtils.java
--- 2/src/jalview/util/HttpUtils.java
+++ b/src/jalview/util/HttpUtils.java
@@@ -17,12 -17,9 +17,12 @@@
   * You should have received a copy of the GNU General Public License
   * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
   * The Jalview Authors are detailed in the 'AUTHORS' file.
-  ******************************************************************************/
+  */
  package jalview.util;
  
 +import java.io.BufferedInputStream;
 +import java.io.File;
 +import java.io.FileOutputStream;
  import java.io.IOException;
  import java.io.InputStream;
  import java.net.URL;

diff --cc src/jalview/ws/rest/RestClient.java
index 1abe36e,7fbae89..54e0e04
--- 1/src/jalview/ws/rest/RestClient.java
--- 2/src/jalview/ws/rest/RestClient.java
+++ b/src/jalview/ws/rest/RestClient.java
@@@ -26,7 -26,9 +26,8 @@@ import jalview.gui.AlignFrame
  import jalview.gui.AlignViewport;
  import jalview.gui.AlignmentPanel;
  import jalview.gui.Desktop;
+ import jalview.gui.JvOptionPane;
  import jalview.gui.WebserviceInfo;
 -import jalview.io.packed.DataProvider.JvDataType;
  import jalview.util.MessageManager;
  import jalview.ws.WSClient;
  import jalview.ws.WSClientI;

diff --cc test/jalview/ws/rest/ShmmrRSBSService.java
index a9989fd,709f2c5..61ad91f
--- 1/test/jalview/ws/rest/ShmmrRSBSService.java
--- 2/test/jalview/ws/rest/ShmmrRSBSService.java
+++ b/test/jalview/ws/rest/ShmmrRSBSService.java
@@@ -24,7 -24,7 +24,8 @@@ import static org.testng.AssertJUnit.as
  import static org.testng.AssertJUnit.assertTrue;
  
  import jalview.gui.AlignFrame;
+ import jalview.gui.JvOptionPane;
 +import jalview.ws.rest.clientdefs.ShmrRestClient;
  
  import java.util.Map;