JAL-3141 Re-added some changes in Jalview2XML missed in the merge