Fix composite comparator with super columns

patch by slebresne; reviewed by thobbs for CASSANDRA-5287
Merge branch 'cassandra-1.2' into trunk

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