Rebase client-connection on master

Also cleanup ServerNetworkSynchronizer

Spout: https://github.com/SpoutDev/Spout/pull/2218
Spout: https://github.com/SpoutDev/Spout/pull/2219
Vanilla: https://github.com/Vanilla/Vanilla/pull/632

@Afforess