Fix updating column_metadata from thrift

patch by slebresne; reviewed by jbellis for CASSANDRA-6182
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	CHANGES.txt