Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial

Conflicts:

	source/scripting/python/samba/provision.py

diff --cc source/scripting/python/samba/provision.py
index 4d99cd9cd965ee661a5addfcc6a7c5bbbee41e4c,26c4afe3c88490f6212f5276c9872506b509c081..f244679eb512763b414f7aea2b4e1472cc927c3b
--- 1/source/scripting/python/samba/provision.py
--- 2/source/scripting/python/samba/provision.py
+++ b/source/scripting/python/samba/provision.py
@@@ -192,8 -198,7 +198,6 @@@ def provision_paths_from_lp(lp, dnsdoma
      paths.samdb = os.path.join(private_dir, lp.get("sam database") or "samdb.ldb")
      paths.secrets = os.path.join(private_dir, lp.get("secrets database") or "secrets.ldb")
      paths.templates = os.path.join(private_dir, "templates.ldb")
-     paths.keytab = os.path.join(private_dir, "secrets.keytab")
-     paths.dns_keytab = "dns.keytab"
 -
      paths.dns = os.path.join(private_dir, dnsdomain + ".zone")
      paths.winsdb = os.path.join(private_dir, "wins.ldb")
      paths.s4_ldapi_path = os.path.join(private_dir, "ldapi")