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
Merge branch 'cassandra-2.1' into trunk
forgot to add CASSANDRA-7317 to CHANGES
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Modify reconcile logic to always pick a tombstone over a counter cell

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7346
Merge branch 'cassandra-2.1' into trunk
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
Merge branch 'cassandra-2.1' into trunk
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
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
don't mask class' template parameter
Change schema change response in native protocol v3

patch by slebresne; reviewed by thobbs for CASSANDRA-7413
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	CHANGES.txt