Added ServerId to ServerDescription and removed it from IServer.