Merge branch 'rabbitmq-server-1508' into rabbitmq-server-1508-master

Author: lukebakken

scripts/rabbitmq-env

@@ -348,7 +348,7 @@ run_escript()
     exec "${ERL_DIR}erl" +B \
         -boot "$CLEAN_BOOT_FILE" \
         -noinput -noshell -hidden -smp enable \
-        "$RABBITMQ_NAME_TYPE" "rabbitmqescript$$@localhost"
+        "$RABBITMQ_NAME_TYPE" "rabbitmqescript$$@localhost" \
         $RABBITMQ_CTL_ERL_ARGS \ # Do *not* quote this
         -kernel inet_dist_listen_min "$RABBITMQ_CTL_DIST_PORT_MIN" \
         -kernel inet_dist_listen_max "$RABBITMQ_CTL_DIST_PORT_MAX" \