HBASE-11565 Stale connection could stay for a while
Merge remote-tracking branch 'remotes/origin/0.96' into 0.96