r19444: merge from samba4: