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
Allow browsing in jacoco-report

Patch by Russ Hatch, reviewed by brandonwilliams for CASSANDRA-7226
Accept subtypes for function results, type casts

Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-6766
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/TypeCast.java
	src/java/org/apache/cassandra/cql3/statements/Selection.java
Merge branch 'cassandra-2.1' into trunk
Reduce unit test times due to schema loading

Patch by Lyuben Todorov; reviewed by Tyler Hobbs for CASSANDRA-6968
revert #7275
Merge branch 'cassandra-1.2' into cassandra-2.0