cqlsh: Ninja-alter blob formatter (prepend '0x')
Merge branch 'cassandra-1.2' into trunk