Signed-off-by: Xin Sun <ddupgs@gmail.com> (cherry picked from commit 0c4263a18be13f412fcf71ebba9715dcc5ca2a12) Conflicts: hbase-client/src/main/java/org/apache/hadoop/hbase/security/NettyHBaseSaslRpcClientHandler.java hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ServerRpcConnection.java