switch shuffle's insert of a token to using new blob syntax
patch by dbrosius reviewed by ayeschenko for CASSANDRA-5465
Merge branch 'cassandra-1.2' into trunk