Signed-off-by: Balazs Meszaros <meszibalu@apache.org> (cherry picked from commit fb529e23526eaa250bdd355db3c2f0dedc55c3e8) Conflicts: hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcConnection.java
Signed-off-by: Balazs Meszaros <meszibalu@apache.org> (cherry picked from commit fb529e23526eaa250bdd355db3c2f0dedc55c3e8) Conflicts: hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcConnection.java