Improve with_ntdb_internal handling, update to samba-4.1.6.