Fix HSHA server introducing corrupt data

patch by xedin; reviewed by slebresne for CASSANDRA-6285
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt