diff -Nru rabbitmq-server-3.5.7/debian/changelog rabbitmq-server-3.5.7/debian/changelog
--- rabbitmq-server-3.5.7/debian/changelog	2017-07-27 18:38:31.000000000 +0000
+++ rabbitmq-server-3.5.7/debian/changelog	2020-04-23 16:21:03.000000000 +0000
@@ -1,3 +1,16 @@
+rabbitmq-server (3.5.7-1ubuntu0.16.04.3) xenial; urgency=medium
+
+  * Fix timeout discrepancy between SysV and systemd (LP: #1874075)
+    upstream, rabbitmq-server-release - 694540270c8
+  * d/rabbitmq-server.init
+    - Add RABBITMQ_STARTUP_TIMEOUT and default to 600
+  * d/rabbitmq-server.service
+    - Default TimeoutStartSec to 600
+  * d/rabbitmq-server-wait
+    - Use value of RABBITMQ_STARTUP_TIMEOUT in wait
+
+ -- Nicolas Bock <nicolas.bock@canonical.com>  Wed, 22 Apr 2020 22:02:31 +0000
+
 rabbitmq-server (3.5.7-1ubuntu0.16.04.2) xenial-security; urgency=medium
 
   * SECURITY UPDATE: authentication bypass (LP: #1706900)
diff -Nru rabbitmq-server-3.5.7/debian/rabbitmq-server-wait rabbitmq-server-3.5.7/debian/rabbitmq-server-wait
--- rabbitmq-server-3.5.7/debian/rabbitmq-server-wait	2016-01-18 14:05:55.000000000 +0000
+++ rabbitmq-server-3.5.7/debian/rabbitmq-server-wait	2020-04-23 15:14:12.000000000 +0000
@@ -19,4 +19,4 @@
 # Non-empty defaults should be set in rabbitmq-env
 . `dirname $0`/rabbitmq-env
 
-/usr/lib/rabbitmq/bin/rabbitmqctl wait $RABBITMQ_PID_FILE
+/usr/lib/rabbitmq/bin/rabbitmqctl wait --timeout $RABBITMQ_STARTUP_TIMEOUT $RABBITMQ_PID_FILE
diff -Nru rabbitmq-server-3.5.7/debian/rabbitmq-server.init rabbitmq-server-3.5.7/debian/rabbitmq-server.init
--- rabbitmq-server-3.5.7/debian/rabbitmq-server.init	2016-01-18 14:05:55.000000000 +0000
+++ rabbitmq-server-3.5.7/debian/rabbitmq-server.init	2020-04-23 15:14:12.000000000 +0000
@@ -1,4 +1,11 @@
 #!/bin/sh
+#
+# rabbitmq-server RabbitMQ broker
+#
+# chkconfig: - 80 05
+# description: Manages RabbitMQ server
+#
+
 ### BEGIN INIT INFO
 # Provides:          rabbitmq-server
 # Required-Start:    $remote_fs $network
@@ -6,7 +13,7 @@
 # Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6
 # Description:       RabbitMQ broker
-# Short-Description: Enable AMQP service provided by RabbitMQ broker
+# Short-Description: Manages RabbitMQ server
 ### END INIT INFO
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
@@ -15,10 +22,9 @@
 CONTROL=/usr/sbin/rabbitmqctl
 DESC="RabbitMQ Messaging Server"
 USER=rabbitmq
-ROTATE_SUFFIX=
-INIT_LOG_DIR=/var/log/rabbitmq
 PID_FILE=/var/run/rabbitmq/pid
-
+RABBITMQ_LOG_BASE=/var/log/rabbitmq
+RABBITMQ_STARTUP_TIMEOUT=600
 
 test -x $DAEMON || exit 0
 test -x $CONTROL || exit 0
@@ -53,8 +59,8 @@
         set +e
         RABBITMQ_PID_FILE=$PID_FILE start-stop-daemon --quiet \
             --chuid rabbitmq --start --exec $DAEMON \
-            --pidfile "$RABBITMQ_PID_FILE" --background
-        $CONTROL wait $PID_FILE >/dev/null 2>&1
+            --pidfile "$PID_FILE" --background
+        $CONTROL wait --timeout $RABBITMQ_STARTUP_TIMEOUT $PID_FILE >/dev/null 2>&1
         RETVAL=$?
         set -e
         if [ $RETVAL != 0 ] ; then
@@ -69,7 +75,9 @@
     status_rabbitmq quiet
     if [ $RETVAL = 0 ] ; then
         set +e
-        $CONTROL stop ${PID_FILE} > ${INIT_LOG_DIR}/shutdown_log 2> ${INIT_LOG_DIR}/shutdown_err
+        $CONTROL stop ${PID_FILE} \
+            > ${RABBITMQ_LOG_BASE}/shutdown_log \
+            2> ${RABBITMQ_LOG_BASE}/shutdown_err
         RETVAL=$?
         set -e
         if [ $RETVAL = 0 ] ; then
@@ -95,7 +103,7 @@
 
 rotate_logs_rabbitmq() {
     set +e
-    $CONTROL -q rotate_logs ${ROTATE_SUFFIX}
+    $CONTROL -q rotate_logs
     if [ $? != 0 ] ; then
         RETVAL=1
     fi
@@ -136,7 +144,7 @@
             RETVAL=0
             ;;
         *)
-            log_warning_msg "FAILED - check ${INIT_LOG_DIR}/startup_\{log, _err\}"
+            log_warning_msg "FAILED - check ${RABBITMQ_LOG_BASE}/startup_\{log, _err\}"
             log_end_msg 1
             ;;
     esac
diff -Nru rabbitmq-server-3.5.7/debian/rabbitmq-server.service rabbitmq-server-3.5.7/debian/rabbitmq-server.service
--- rabbitmq-server-3.5.7/debian/rabbitmq-server.service	2016-01-18 14:05:55.000000000 +0000
+++ rabbitmq-server-3.5.7/debian/rabbitmq-server.service	2020-04-23 15:14:12.000000000 +0000
@@ -7,6 +7,7 @@
 User=rabbitmq
 SyslogIdentifier=rabbitmq
 LimitNOFILE=65536
+Environment=RABBITMQ_STARTUP_TIMEOUT=600
 ExecStart=/usr/sbin/rabbitmq-server
 ExecStartPost=/usr/lib/rabbitmq/bin/rabbitmq-server-wait
 ExecStop=/usr/sbin/rabbitmqctl stop