Fix typo in CFDefinition

patch by slebresne; reviewed by iamaleksey for CASSANDRA-7452
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	src/java/org/apache/cassandra/cql3/CFDefinition.java
Ensure writes have completed after dropping a table, before recycling commit log segments

patch by Benedict Elliott Smith; reviewed by Jake Luciani for CASSANDRA-7437
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk