Try harder to not let a node flap after the gossip goodbye.
Patch by brandonwilliams, reviewed by jasobrown for CASSANDRA-5254
Fix unit tests on java7
Patch by Marcus Eriksson, reviewed by brandonwilliams for CASSANDRA-5315
forgotten files