r22280: merge from samba4: