Merge pull request #20584 from mpeleshenko/samba4-4.17.5