[sys-apps/systemd] backport upstream Gentoo patches from v206