Merge "Translate xml server tenantId /userId"