Systemd: merge upstream journald.conf changes