Merge lorikeet-heimdal -r 787 into Samba4 tree.