r20820: merge from samba4: