consistentify CFMetaData system schema formatting
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/config/CFMetaData.java