diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index c541bab3bb5..40cc281ea83 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -109,10 +109,6 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-core</artifactId>
         </dependency>
-        <dependency>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-test</artifactId>
-        </dependency>
       </dependencies>
     </profile>
 
@@ -137,10 +133,6 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-annotations</artifactId>
         </dependency>
-        <dependency>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-minicluster</artifactId>
-        </dependency>
       </dependencies>
       <build>
         <plugins>
@@ -191,10 +183,6 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-annotations</artifactId>
         </dependency>
-        <dependency>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-minicluster</artifactId>
-        </dependency>
       </dependencies>
       <build>
         <plugins>
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index c134fc1c4a2..8a054532da6 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -274,6 +274,10 @@
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-protocol</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-client</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-common</artifactId>
@@ -477,7 +481,6 @@
     <dependency>
       <groupId>org.cloudera.htrace</groupId>
       <artifactId>htrace</artifactId>
-      <version>1.49</version>
    </dependency>
   </dependencies>
   <profiles>
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterListTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterListTmpl.jamon
new file mode 100644
index 00000000000..f3a3a82157e
--- /dev/null
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterListTmpl.jamon
@@ -0,0 +1,69 @@
+<%doc>
+Copyright The Apache Software Foundation
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ </%doc>
+
+<%args>
+HMaster master;
+</%args>
+
+<%import>
+        java.util.*;
+        org.apache.hadoop.util.StringUtils;
+        org.apache.hadoop.hbase.util.Bytes;
+        org.apache.hadoop.hbase.master.HMaster;
+        org.apache.hadoop.hbase.HConstants;
+        org.apache.hadoop.hbase.ServerName;
+        org.apache.hadoop.hbase.ClusterStatus;
+</%import>
+
+<%java>
+Collection<ServerName> backupMasters = null;
+if (master.isActiveMaster()) {
+    ClusterStatus status = master.getClusterStatus();
+    backupMasters = status.getBackupMasters();
+}
+</%java>
+
+<table class="table table-striped">
+<%if (backupMasters != null && backupMasters.size() > 0)%>
+<tr>
+    <th>ServerName</th>
+    <th>Port</th>
+    <th>Start time</th>
+</tr>
+<%java>
+    ServerName [] serverNames = backupMasters.toArray(new ServerName[backupMasters.size()]);
+    Arrays.sort(serverNames);
+    for (ServerName serverName: serverNames) {
+</%java>
+<tr>
+    <td><% serverName.getHostname() %></td>
+    <td><% serverName.getPort() %></td>
+    <td><% new Date(serverName.getStartcode()) %></td>
+</tr>
+<%java>
+    }
+</%java>
+</%if>
+<tr><td>Total:<% (backupMasters != null) ? backupMasters.size() : 0 %></td>
+</table>
+
+
+
+
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
index e7fb621e338..669b95cd11f 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
@@ -126,6 +126,8 @@ org.apache.hadoop.hbase.HBaseConfiguration;
           </div>
         </%if>
 
+        <h2>Backup Masters</h2>
+        <& BackupMasterListTmpl; master = master &>
 
         <h2>Region Servers</h2>
         <& RegionServerListTmpl; master= master; servers = servers &>
diff --git a/pom.xml b/pom.xml
index 049ef3fa24a..f2b240a4f40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
   <modules>
     <module>hbase-server</module>
     <module>hbase-protocol</module>
+    <module>hbase-client</module>
     <module>hbase-hadoop2-compat</module>
     <module>hbase-hadoop1-compat</module>
     <module>hbase-hadoop-compat</module>
@@ -847,6 +848,7 @@
     <jersey.version>1.8</jersey.version>
     <jruby.version>1.6.8</jruby.version>
     <junit.version>4.10-HBASE-1</junit.version>
+    <htrace.version>1.49</htrace.version>
     <slf4j.version>1.4.3</slf4j.version>
     <log4j.version>1.2.17</log4j.version>
     <mockito-all.version>1.9.0</mockito-all.version>
@@ -970,6 +972,11 @@
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <artifactId>hbase-client</artifactId>
+        <groupId>org.apache.hbase</groupId>
+        <version>${project.version}</version>
+      </dependency>
       <!-- General dependencies -->
       <dependency>
         <groupId>io.netty</groupId>
@@ -1221,6 +1228,11 @@
         <!-- FIXME: the following needs to go away once HBASE-4955 is fixed -->
         <optional>true</optional>
       </dependency>
+      <dependency>
+        <groupId>org.cloudera.htrace</groupId>
+        <artifactId>htrace</artifactId>
+        <version>${htrace.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-all</artifactId>