AMBARI-6246. Failed to start Supervisor and Nagios after upgrade. (mahadev)

ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog161.java

@@ -298,6 +298,7 @@ public class UpgradeCatalog161 extends AbstractUpgradeCatalog {
   
   protected void addMissingConfigs() throws AmbariException {
     updateConfigurationProperties("hbase-site", Collections.singletonMap("hbase.regionserver.info.port", "60030"), false);
+    updateConfigurationProperties("hbase-site", Collections.singletonMap("hbase.master.info.port", "60010"), false);
     updateConfigurationProperties("global", Collections.singletonMap("oozie_admin_port", "11001"), false);
     updateConfigurationProperties("hive-site", Collections.singletonMap("hive.heapsize", "1024"), false);
   }

ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog161Test.java

@@ -142,6 +142,10 @@ public class UpgradeCatalog161Test {
     upgradeCatalog.updateConfigurationProperties("hbase-site",
         Collections.singletonMap("hbase.regionserver.info.port", "60030"), false);
     expectLastCall();
+
+    upgradeCatalog.updateConfigurationProperties("hbase-site",
+        Collections.singletonMap("hbase.master.info.port", "60010"), false);
+    expectLastCall();
     
     upgradeCatalog.updateConfigurationProperties("global",
         Collections.singletonMap("oozie_admin_port", "11001"), false);