Fixed the error when tracing query with cqlsh

patch by Robert Stupp; reviewed by Mikhail Stepura for CASSANDRA-7613
Merge branch 'cassandra-2.1' into trunk