unquote uuid in cql string
Merge branch 'cassandra-1.2' into trunk