Fix range merging to avoid creating wrapping ones
Detect (and warn) unintentional use of the cql2 thrift methods when cql3 was intended

patch by slebresne; reviewed by jbellis for CASSANDRA-5172
Merge branch 'cassandra-1.2' into trunk
Remove endpoints from system.peers correctly.
Patch by brandonwilliams reviewed by slebresne for CASSANDRA-5167
Merge branch 'cassandra-1.2' into trunk