Merge pull request #1666 from rabbitmq/lrb-ssl_dist_optfile-windows-159602360

Set two environment variables in the same manner as on Unix systems

Author: michaelklishin

scripts/rabbitmq-env.bat

@@ -174,7 +174,6 @@ if "!RABBITMQ_SERVER_ERL_ARGS!"=="" (
 )
 
 REM [ "x" = "x$RABBITMQ_CONFIG_FILE" ] && RABBITMQ_CONFIG_FILE=${CONFIG_FILE}
-
 CALL :unquote RABBITMQ_CONFIG_FILE %RABBITMQ_CONFIG_FILE%
 if "!RABBITMQ_CONFIG_FILE!"=="" (
     if "!CONFIG_FILE!"=="" (
@@ -236,10 +235,18 @@ if not exist "!RABBITMQ_MNESIA_BASE!" (
 for /f "delims=" %%F in ("!RABBITMQ_MNESIA_BASE!") do set RABBITMQ_MNESIA_BASE=%%~sF
 
 REM [ "x" = "x$RABBITMQ_SERVER_START_ARGS" ] && RABBITMQ_SERVER_START_ARGS=${SERVER_START_ARGS}
-REM No Windows equivalent
+if "!RABBITMQ_SERVER_START_ARGS!"=="" (
+    if not "!SERVER_START_ARGS!"=="" (
+        set RABBITMQ_SERVER_START_ARGS=!SERVER_START_ARGS!
+    )
+)
 
 REM [ "x" = "x$RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS" ] && RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=${SERVER_ADDITIONAL_ERL_ARGS}
-REM No Windows equivalent
+if "!RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS!"=="" (
+    if not "!SERVER_ADDITIONAL_ERL_ARGS!"=="" (
+        set RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=!SERVER_ADDITIONAL_ERL_ARGS!
+    )
+)
 
 REM [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${MNESIA_DIR}
 REM [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}