Workaround for netty issue causing corrupted data to come off the wire

patch by tjake, test by Johan Bjork; reviewed by belliottsmith for (CASSANDRA-7695)
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk