r19192: merge from samba4: