Fix column name serialization for cassandra-stress/stressd

patch by rspitzer; reviewed by benedict for CASSANDRA-7608
Merge branch 'cassandra-2.1' into trunk