Conflicts: hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/RegionReplicaReplicationEndpoint.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/RestartMetaTest.java
Conflicts: hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/RegionReplicaReplicationEndpoint.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/RestartMetaTest.java