Merge branch 'alpha/JAL-3899_deuniquify_refactor' into alpha/JAL-3066_Jalview_212_sli...