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
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
Remove rows_per_partition_to_cache keyword

Patch by marcuse; reviewed by jbellis for CASSANDRA-7193
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
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
ninja assert
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
	src/java/org/apache/cassandra/tools/NodeCmd.java
forgot to add CASSANDRA-7317 to CHANGES
Merge branch 'cassandra-2.0' into cassandra-2.1
Modify reconcile logic to always pick a tombstone over a counter cell

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7346
Use 'text' formatter for 'ascii' values

patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-7407
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	pylib/cqlshlib/formatting.py
Handle possible integer overflow in FastByteArrayOutputStream.

patch by Mikhail Stepura; reviewed by Jonathan Ellis for CASSANDRA-7373
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt