Reject bootstrapping endpoints that are already in the ring with
different gossip data
Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-5571
Merge branch 'cassandra-2.0' into trunk
update changes
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	CHANGES.txt
add ticket number to changes
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
fix a bunch of typos
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into trunk