Better error checking of stress profile

patch by tjake; reviewed by belliottsmith for CASSANDRA-7716
Merge branch 'cassandra-2.1' into trunk