Merge branch 'Jalview-BH/JAL-3026' into task/JAL-3033_jalviewjs_ant