r22254: merge from samba4: