HBASE-11277 RpcServer threads can wedge under high load
Merge remote-tracking branch 'remotes/origin/0.96' into 0.96