Store the endpoint for a server if it exists
Store the tenant_id

There is a naming inconsistency with some of the fields returned by
servers. This is replicated in the Server object itself.