Ninja-fix test_cqlsh_output.py
Merge branch 'cassandra-1.2' into trunk