Data-model for convergence.

Does this mean we're doubling down on the server-id-that-is-distinct-from-nova-server-id thing? I can't actually remember what the conclusion from that PR was.