Merge commit failure policy into 2.1

patch by Benedict Elliott Smith; reviewed by Marcus Eriksson for CASSANDRA-7429
Merge branch 'cassandra-2.1.0' into cassandra-2.1