Merge "Remove XML related code from RestClient"