Merge branch 'master' into Theaxiom-patch-2

image/services/syslog-ng/syslog-ng.init

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -em
 
 # If /dev/log is either a named pipe or it was placed there accidentally,
 # e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25,

image/services/syslog-ng/syslog-ng.shutdown

@@ -20,5 +20,8 @@ syslogng_wait() {
     return $RET
 }
 
-kill $(cat "$PIDFILE")
+if [ -f "$PIDFILE" ]; then
+    kill $(cat "$PIDFILE")
+fi
+
 syslogng_wait 0 $?