HBASE-11547 Backport HBASE-11052 to 0.96 'Sending random data crashes thrift service' (Adrian)
Merge remote-tracking branch 'remotes/origin/0.96' into 0.96