r8673: merged from samba4