Complete backport of JGRP-1760

Bela

I did not mark GossipRouterTest as EAP_DISABLED as we still support a TCPGOSSIP configuration for EAP.