Merge "Strip off TenantId from self link url"