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
Yes, you're right.  Something to investigate.