Merge pull request #1740 from rabbitmq/rabbitmq-server-161167716-2

Merge some missed v3.7.x changes into master

Author: michaelklishin

scripts/rabbitmq-diagnostics.bat

@@ -53,7 +53,6 @@ if not defined ERL_CRASH_DUMP_SECONDS (
 -kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
 -sasl errlog_type error ^
 -mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^
--nodename !RABBITMQ_NODENAME! ^
 -run escript start ^
 -escript main rabbitmqctl_escript ^
 -extra "%RABBITMQ_HOME%\escript\rabbitmq-diagnostics" !STAR!
@@ -63,4 +62,3 @@ if ERRORLEVEL 1 (
 )
 
 endlocal
-endlocal

scripts/rabbitmq-env

@@ -411,7 +411,6 @@ run_escript()
         -kernel inet_dist_listen_max "$RABBITMQ_CTL_DIST_PORT_MAX" \
         -sasl errlog_type error \
         -mnesia dir "\"$RABBITMQ_MNESIA_DIR\"" \
-        -nodename "$RABBITMQ_NODENAME" \
         -run escript start \
         -escript main "$escript_main" \
         -extra "$escript" "$@"

scripts/rabbitmq-plugins.bat

@@ -53,7 +53,6 @@ if not defined ERL_CRASH_DUMP_SECONDS (
 -kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
 -sasl errlog_type error ^
 -mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^
--nodename !RABBITMQ_NODENAME! ^
 -run escript start ^
 -escript main rabbitmqctl_escript ^
 -extra "%RABBITMQ_HOME%\escript\rabbitmq-plugins" !STAR!

scripts/rabbitmqctl.bat

@@ -53,7 +53,6 @@ if not defined ERL_CRASH_DUMP_SECONDS (
 -kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
 -sasl errlog_type error ^
 -mnesia dir \""!RABBITMQ_MNESIA_DIR:\=/!"\" ^
--nodename !RABBITMQ_NODENAME! ^
 -run escript start ^
 -escript main rabbitmqctl_escript ^
 -extra "%RABBITMQ_HOME%\escript\rabbitmqctl" !STAR!