Ninja-commit to suppress blist-related warnings in cqlsh
Merge branch 'cassandra-2.1' into trunk