Merge pull request #22348 from miska/samba4