Track metrics at a keyspace level

Patch by brandonwilliams, reviewed by yukim for CASSANDRA-6539
fix wrong patch commit
Merge branch 'cassandra-1.2' into cassandra-2.0
Don't insert tombstones that hide indexed values into 2i

patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-7268
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
Handle empty CFs in Memtable#maybeUpdateLiveRatio()

patch by Christian Spriegel; reviewed by Aleksey Yeschenko for
CASSANDRA-7401
Increase socket bind backlog to 500
Patch by Oleg Anastasyev, reviewed by brandonwilliams for CASSANDRA-7236
Clean up gossiper fully after shadow round.

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7318
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
nodetool doesn't error when ~/.cassandra is inaccessible

Patch by Kirk True, reviewed by brandonwilliams for CASSANDRA-6449
Fix BatchlogManagerTest consistency

patch by Carl Yeksigian; reviewed by Michael Shuler for CASSANDRA-7397
Fix assertion error in CL.ANY timeout handling

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-7364
Set fd initial value to 2s

Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-7307
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/gms/FailureDetector.java
Move latch.countDown() into "finally" block

patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7275
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
cqlsh: ignore .cassandra permission errors

patch by Mihai Suteu; reviewed by Mikhail Stepura for CASSANDRA-7266
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Account for range tombstones in min/max column names

Patch by Oleg Anastasyev, reviewed by marcuse for CASSANDRA-7235
Improve validation of sub range repair

also prevent "-pr" repair not to work with "-dc/-hosts/-local".
patch by yukim; reviewed by krummas for CASSANDRA-7317