2.87 backport of systemd, enhanced systemd stuff etc.