Merge remote-tracking branch 'upstream/release-v3.6' into localcache36

# Conflicts:
#	scripts/install/openim-tools.sh

scripts/install/openim-tools.sh

@@ -101,7 +101,9 @@ function openim::tools::start_service() {
     cmd="${cmd} --prometheus_port ${prometheus_port}"
   fi
   openim::log::status "Starting binary ${binary_name}..."
- ${cmd} 
+
+ ${cmd}
+
  local status=$?
 
     if [ $status -eq 0 ]; then