revert #7275
Merge branch 'cassandra-1.2' into cassandra-2.0
merge from 2.0
Allow counter mutations in UNLOGGED batches

patch by tjake; reviewed by Aleksey Yeschenko for CASSANDRA-7351
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	test/unit/org/apache/cassandra/cql3/DeleteTest.java
(ninja) Deduplicate BatchStatement hasConditions inference logic
Merge branch 'cassandra-2.1' into trunk
Revert "add file:/// on Windows to -Dcassandra.config value"

This reverts commit 498ee24b52a6876a008c3d3d3ef4870e4bd9842c.
Merge branch 'cassandra-2.1' into trunk
Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1
Merge remote-tracking branch 'origin/trunk' into trunk
Fix cqlsh DESC with CompositeType
explanation

patch by mstepura; reviewed by thobbs for CASSANDRA-7399
Fix heap size calculation for CompoundSparseCellName/.WithCollection

patch by Benedict Elliott Smith; reviewed by Dave Brosius CASSANDRA-7421
Merge branch 'cassandra-2.1' into trunk
Fix heap size calculation for CompoundSparseCellName/.WithCollection

patch by Benedict Elliott Smith; reviewed by Dave Brosius CASSANDRA-7421
Merge branch 'cassandra-2.1' into trunk
dedup CHANGES
Merge branch 'cassandra-2.1' into trunk
Update versions for 2.1.0-rc2 release
Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)

patch by Matt Kennedy; reviewed by Benedict Elliott Smith for CASSANDRA-7416