r19100: merge from samba4: