Allow propagating multiple gossip states atomically

Patch by brandonwilliams, reviewed by jasobrown for CASSANDRA-6125
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt