Merge recent wkssvc changes from samba4.