Rebase client-connection on master

Also cleanup ServerNetworkSynchronizer

@Afforess