ConnectionId now has-a ServerId, which in turn has-a ClusterId.

Updated all the listener interfaces to take parameters of type ConnectionId, ServerId, or ClusterId, as appropriate

  JAVA-1512, JAVA-1513
This is the only negative consequence of removing equals from the events.  Is there another way to do this that doesn't rely on an equals method for each event?