Small change to wire protocol to allow mergeFrom to be used more often
Added untested ClusterState class
Integrated ClusterState into CatcherServerImpl
Merge from upstream