Merge "Fix bug in getXVO() that produced XVO headers with stray semicolons"