Ported ClusterId, ServerId and ConnectionId over from v2 branch.