Merge pull request #8353 from Andy2244/samba4-heimdal