Preserves CQL metadata when updating table from thrift

patch by mishail; reviewed by iamaleksey & slebresne for CASSANDRA-6831