ninja fix cassandra-stress pre-2.1.1 compatibility
Merge branch 'cassandra-2.1' into trunk