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
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
enable code coverage using JaCoCo

patch by rhatch reviewed by dbrosius for cassandra-7226
switch external naming of 'column families' to 'tables'

patch by dbrosius reviewed by jbellis for cassandra-7369
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
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/Memtable.java
Merge branch 'cassandra-2.1' into trunk
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
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Remove rows_per_partition_to_cache keyword

Patch by marcuse; reviewed by jbellis for CASSANDRA-7193
Merge branch 'cassandra-2.1' into trunk
Account for range tombstones in min/max column names

Patch by Oleg Anastasyev, reviewed by marcuse for CASSANDRA-7235
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/ColumnFamily.java
	src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
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