cqlsh: ninja-kill 'Perhaps you meant to use CQL X' warning
Merge branch 'cassandra-1.2' into trunk