INT-3384: restore XmlValidatingMessageSelector and format code