diff -Nru rsyslog-8.16.0/debian/changelog rsyslog-8.16.0/debian/changelog
--- rsyslog-8.16.0/debian/changelog	2016-09-13 14:45:49.000000000 +0000
+++ rsyslog-8.16.0/debian/changelog	2017-09-05 14:45:57.000000000 +0000
@@ -1,3 +1,16 @@
+rsyslog (8.16.0-1ubuntu6) zesty; urgency=medium
+
+  * Cherry pick restart on configuration changes fix from Debian (LP: #1668639)
+    - Trigger restart on configuration changes.
+      Register a dpkg trigger on /etc/rsyslog.d that calls restart on
+      configuration changes. (Closes: #791337)
+    - Update dpkg trigger to use try-restart.
+      Add try-restart action to SysV initscript for that, systemd supports
+      this natively.
+    - debian/control: Add Depends on init-system-helpers (>= 1.47~) to rsyslog.
+
+ -- Frode Nordahl <frode.nordahl@canonical.com>  Tue, 05 Sep 2017 14:45:57 +0000
+
 rsyslog (8.16.0-1ubuntu5) yakkety; urgency=medium
 
   * Use new syntax to enable non-kernel klog messages (LP: #1531622)
diff -Nru rsyslog-8.16.0/debian/control rsyslog-8.16.0/debian/control
--- rsyslog-8.16.0/debian/control	2016-02-03 10:58:39.000000000 +0000
+++ rsyslog-8.16.0/debian/control	2017-09-05 14:45:35.000000000 +0000
@@ -36,6 +36,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          lsb-base (>= 3.2-14),
+         init-system-helpers (>= 1.47~),
          adduser,
          ucf
 Recommends: logrotate
diff -Nru rsyslog-8.16.0/debian/rsyslog.init rsyslog-8.16.0/debian/rsyslog.init
--- rsyslog-8.16.0/debian/rsyslog.init	2016-02-03 10:54:29.000000000 +0000
+++ rsyslog-8.16.0/debian/rsyslog.init	2017-09-05 14:45:35.000000000 +0000
@@ -114,11 +114,14 @@
 	$0 stop
 	$0 start
 	;;
+  try-restart)
+	$0 status >/dev/null 2>&1 && $0 restart
+	;;
   status)
 	status_of_proc -p $PIDFILE $DAEMON $RSYSLOGD && exit 0 || exit $?
 	;;
   *)
-	echo "Usage: $SCRIPTNAME {start|stop|rotate|restart|force-reload|status}" >&2
+	echo "Usage: $SCRIPTNAME {start|stop|rotate|restart|force-reload|try-restart|status}" >&2
 	exit 3
 	;;
 esac
diff -Nru rsyslog-8.16.0/debian/rsyslog.postinst rsyslog-8.16.0/debian/rsyslog.postinst
--- rsyslog-8.16.0/debian/rsyslog.postinst	2016-01-27 22:42:48.000000000 +0000
+++ rsyslog-8.16.0/debian/rsyslog.postinst	2017-09-05 14:45:35.000000000 +0000
@@ -48,6 +48,12 @@
 	fi
     ;;
 
+    triggered)
+	# Try to restart rsyslog
+	invoke-rc.d rsyslog try-restart || true
+	exit 0
+    ;;
+
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;
 
diff -Nru rsyslog-8.16.0/debian/rsyslog.triggers rsyslog-8.16.0/debian/rsyslog.triggers
--- rsyslog-8.16.0/debian/rsyslog.triggers	1970-01-01 00:00:00.000000000 +0000
+++ rsyslog-8.16.0/debian/rsyslog.triggers	2017-09-05 14:45:35.000000000 +0000
@@ -0,0 +1 @@
+interest-noawait /etc/rsyslog.d