Systemd: merge upstream logind.conf changes