Fix error message on read repair timeouts

patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-7947
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt