Lots of changes to integrate FiveTuple-based connections on the p2p server side #302