Merge branch 'develop' into features/JAL-4134_use_annotation_row_for_colours_and_groups

Merge branch 'develop' into features/JAL-4134_use_annotation_row_for_colours_and_groups

 Conflicts:
	src/jalview/datamodel/Alignment.java
	src/jalview/datamodel/ContactMatrix.java
	src/jalview/datamodel/ContactMatrixI.java
	src/jalview/datamodel/SeqDistanceContactMatrix.java
	src/jalview/datamodel/annotations/AnnotationRowBuilder.java
	src/jalview/ext/jmol/JmolParser.java
	src/jalview/gui/AnnotationLabels.java
	src/jalview/gui/TreeCanvas.java
	src/jalview/project/Jalview2XML.java
	src/jalview/renderer/ContactMapRenderer.java
	src/jalview/ws/datamodel/alphafold/PAEContactMatrix.java
	src/jalview/ws/dbsources/EBIAlfaFold.java
	src/jalview/xml/binding/jalview/MatrixType.java
	test/jalview/analysis/AverageDistanceEngineTest.java
	test/jalview/project/Jalview2xmlTests.java