JAL-3285 code changes to Jalview2XML not included in merge