Fix cqlsh deserialization of blobs

Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7603
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk