Merge "Add xml support to keypairs_client and its tests"