Avoid special casing received/expected counts in CAS timeout exceptions

patch by slebresne; reviewed by jbellis for CASSANDRA-6595
Add support for 2.1 global counter shards

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6505
getValidColumnFamilies adds 2I if requested and no ks/cf specified
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6598
getValidColumnFamilies adds 2I if requested and no ks/cf specified
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6598
Add ks.cf names to tombstone logging
patch by Kevin Lovato; reviewed by jbellis for CASSANDRA-6597
Update NEWS for 6589
update CHANGES
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
Check that key_aliases/column_aliases exists before using them
Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-6589
fix indentation
HSHA rethrows OOM
Patch by Mikhail Stepura, reviewed by brandonwilliams for CASSANDRA-6255
Merge branch 'cassandra-1.2' into cassandra-2.0
Paginate batchlog replay

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6569
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/db/BatchlogManager.java
Add example jmx auth file location
Patch by Peter Halliday, reviewed by brandonwilliams for CASSANDRA-6286
Add example jmx auth file location
Patch by Peter Halliday, reviewed by brandonwilliams for CASSANDRA-6286
skip blocking on streaming during drain
patch by jasobrown; reviewed by yukim for CASSANDRA-6603
Merge branch 'cassandra-1.2' into cassandra-2.0
Ninja-add COUNTER_MUTATION to DROPPABLE_VERBS
Merge branch 'cassandra-1.2' into cassandra-2.0