r18996: merge from samba4: