Fix thrift validation refusing row markers on CQL3 tables

patch by slebresne; reviewed by jbellis for CASSANDRA-6081
Fix insertion of collections with CAS

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6069
Merge branch 'cassandra-2.0' into trunk