Signed-off-by: GeorryHuang <huangzhuoyue@apache.org> (cherry picked from commit dad9a7da9298b7f2f396826487d4133e78810895) Conflicts: hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java
Signed-off-by: GeorryHuang <huangzhuoyue@apache.org> (cherry picked from commit dad9a7da9298b7f2f396826487d4133e78810895) Conflicts: hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java