Fix CQLRW for thrift tables
patch by Alex Liu; reviewed by jbellis for CASSANDRA-6002
merge from 1.2
Merge branch 'cassandra-2.0' into trunk