Change-Id: I6f1514b1bc301be553912539e6a4192c2ccc782b Signed-off-by: Apekshit Sharma <appy@apache.org> Conflicts: hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.java
Change-Id: I6f1514b1bc301be553912539e6a4192c2ccc782b Signed-off-by: Apekshit Sharma <appy@apache.org> Conflicts: hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerHostname.java