HCOLL-134  fix the cause of most broken tests, most of the issues were do to my recent silly mistake in TCPReplicator.
Merge remote-tracking branch 'origin/master'