Fix more stress bugs (ninja)
Merge branch 'cassandra-2.1' into trunk