Clean up gossiper fully after shadow round.

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7318
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt