Our unit files still slightly differ. I'm not sure its worth the effort to use the ones in samba-git and add things to them via sed or something. On the other hand the commit that adds support for not creating a process group is useful and should be backported.