Add errors setting to stress help, ninja
Merge branch 'cassandra-2.1' into trunk