Remove the vestiges of default_{read,write}_consistency
Merge branch 'cassandra-1.2' into cassandra-2.0.0

Conflicts:
	src/java/org/apache/cassandra/config/CFMetaData.java
Merge branch 'cassandra-2.0.0' into cassandra-2.0