cassandra-stress: merge 7468 into 2.1, and ninja-fix duration setting for user command
Merge branch 'cassandra-2.1' into trunk