merge some recent tdb changed from samba3