Signed-off-by: zhangduo <zhangduo@apache.org> Conflicts: hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java