Improve error message when stress is having GC issues (ninja)
Merge branch 'cassandra-2.1' into trunk