HCOLL-22 refactors around tcp socket replicators ( still in progress )
Merge remote-tracking branch 'origin/master'