Fix CqlRecordWriter with composite keys
patch by Craig McMillian; reviewed by jbellis for CASSANDRA-5949
Merge branch 'cassandra-1.2' into cassandra-2.0