Signed-off-by: Guanghao Zhang <zghao@apache.org> Conflicts: hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java Amending-Author: Andrew Purtell <apurtell@apache.org>