Quote ks/cf names better.

Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-7093
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
fix DirectoriesTest for Windows
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7251
Merge branch 'cassandra-2.1' into trunk
Fix nodetool netstats

Patch by marcuse; reviewed by JoshuaMcKenzie for CASSANDRA-7270
Merge branch 'cassandra-2.1' into trunk
Fix 2ndary index queries with DESC clustering order

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

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Fix merge
Merge branch 'cassandra-2.1' into trunk
Invalidate key cache on table drop

patch by thobbs; reviewed by slebresne for CASSANDRA-6525
Fix flapping RecoveryManagerTest

patch by benedict; reviewed by jbellis for CASSANDRA-7084
Add missing iso8601 patterns for date strings

patch by chander; reviewed by slebresne for CASSANDRA-6973
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java
	src/java/org/apache/cassandra/db/marshal/UUIDType.java
Change concurrent_compactors defaults
patch by jbellis; reviewed by bes for CASSANDRA-7139
Merge branch 'cassandra-2.1' into trunk
fix CliTest on Windows
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7194
Merge branch 'cassandra-2.1' into trunk