Merge branch 'develop' of github.com:apache/rocketmq into develop

namesrv/src/main/java/org/apache/rocketmq/namesrv/NamesrvStartup.java

@@ -170,4 +170,8 @@ public class NamesrvStartup {
 
         return options;
     }
+
+    public static Properties getProperties() {
+        return properties;
+    }
 }