Ninja: fixed cqlsh test (after 7d7d529)
Merge branch 'cassandra-2.1' into trunk