Revert "add file:/// on Windows to -Dcassandra.config value"

This reverts commit 498ee24b52a6876a008c3d3d3ef4870e4bd9842c.
Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1
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
dedup CHANGES
Update versions for 2.1.0-rc2 release
Expose global CF metrics

Patch by Chris Lohfink, reviewed by brandonwilliams for CASSANDRA-7273
Merge branch 'cassandra-1.2' into cassandra-2.0
Expose global CF metrics

Patch by Chris Lohfink, reviewed by brandonwilliams for CASSANDRA-7273
Merge branch 'cassandra-2.0' into cassandra-2.1
Expose global CF metrics

Patch by Chris Lohfink, reviewed by brandonwilliams for CASSANDRA-7273
ninja fix busted test
clean out in_memory_compaction_limit
patch by jbellis; reviewed by ayeschenko for CASSANDRA-7428
Support DISTINCT for static columns

This also fix the behaviour when DISTINCT is not used.

patch by slebresne; reviewed by thobbs for CASSANDRA-7305
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Fix CompositeType columns in DESCRIBE TABLE output

Patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7399
Merge branch 'cassandra-1.2' into cassandra-2.0

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

Conflicts:
	bin/cqlsh
Fix replace_address after CASSANDRA-7356 broke it

Patch by Tyler Hobbs and Marcus Eriksson; reviewed by Brandon Williams for CASSANDRA-7356
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/config/DatabaseDescriptor.java
	src/java/org/apache/cassandra/service/StorageService.java