JAL-3253 reconciled with Jalview-JS/develop (cosmetic changes)