Write row markers when serializing schema

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5572
Merge branch 'cassandra-1.2' into trunk

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