Fix thrift validation when inserting in CQL3 tables

Fixup for #5138
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk