CONN-1025 Merge conflict on xhtml