Merge tag '6.8-rc-smb-server-fixes-part2' of git://git.samba.org/ksmbd