Merge branch 'update/JAL-3066_updated_testng' into alpha/JAL-3066_Jalview_212_slivka...