Merge "Simplify xml/json client selection"