Ignore fat clients when checking for endpoint collision

Patch by brandonwilliams, reviewed by tjake for CASSANDRA-7939
Merge branch 'cassandra-2.0' into cassandra-2.1
Ignore fat clients when checking for endpoint collision

Patch by brandonwilliams, reviewed by tjake for CASSANDRA-7939
Merge branch 'cassandra-2.1' into trunk
Fix possible infinite loop in create repair range

patch by Jimmy Mårdell; reviewed by yukim for CASSANDRA-7983
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/service/StorageServiceServerTest.java
Merge branch 'cassandra-2.1' into trunk
Fix error in sstableloader with -cph > 1

patch by yukim; reviewed by Josh McKenzie for CASSANDRA-8007
Merge branch 'cassandra-2.1' into trunk
Archive any commitlog segments present at startup
patch by Sam Tunnicliffe; reviewed by bes and jbellis for CASSANDRA-6904
merge from 2.0
Merge branch 'cassandra-2.1' into trunk
Fail on very large batch sizes
patch by Carl Yeksigian; reviewed by Sankalp Kohli for CASSANDRA-8011
cqlsh: Fix IPv6 Support

This commit upgrades the bundled datastax/python-driver to
ad2f61f8655.

Patch by Tyler Hobbs; reviewed by Philip Thompson for CASSANDRA-7988
Merge branch 'cassandra-2.1' into trunk
Increase nodetool Xmx
patch by Nikolai Grigoriev; reviewed by jbellis for CASSANDRA-7956
merge from 2.0
Merge branch 'cassandra-2.1' into trunk
Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1
Merge remote-tracking branch 'origin/trunk' into trunk