Fix help message for stress counter_write
patch by Benedict Elliott Smith; reviewed by Pavel Yaskevich for CASSANDRA-6824
Merge branch 'cassandra-2.1' into trunk
Ninja-commit for "Add LZ4Compressor in CQL document" CASSANDRA-6331
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk