r22054: merge from samba4: