Merge branch 'upstream' into bug/init

Conflicts:
	configs/shibd-debian.in

diff --cc configs/shibd-debian.in
index 7ffc1f6,13e8240..3b59c86
--- 1/configs/shibd-debian.in
--- 2/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@@ -69,9 -69,10 +69,9 @@@ stop
  restart|force-reload)
      echo -n "Restarting $DESC: "
      start-stop-daemon --stop --quiet --pidfile $PIDFILE \
 -        --exec $DAEMON
 -    sleep 1
 -    start-stop-daemon --start --quiet \
 -        --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
 +        --retry TERM/30/KILL/5 --exec $DAEMON
-     start-stop-daemon --background --start --quiet \
-         --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
++    start-stop-daemon --start --quiet --pidfile $PIDFILE \
++        --exec $DAEMON -- $DAEMON_OPTS
      echo "$NAME."
      ;;
  *)