systemd: merge 2 patches from git master.