Merge "Add XML support to the server personality test."