Fix MS expiring map timeout for CAS messages

patch by kohlisankalp; reviewed by slebresne for CASSANDRA-7752
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
ninja: fix bad class name in UFTest (CASSANDRA-7395)
Fix CRR, add pig test for it

Patch by Mike Adamson, reviewed by brandonwilliams for CASSANDRA-7726
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Add trace entries about concurrent range requests

Patch and review by Tyler Hobbs and Sylvain Lebresne for CASSANDRA-7599
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix CRR test

Patch by Mike Adamson, reviewed by brandonwilliams for CASSANDRA-7726
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix thrift range filtering w/out 2ary index lookups

Patch by Sam Tunnicliffe; review by Tyler Hobbs for CASSANDRA-7741
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix failing cqlsh formatting tests

Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7703