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

Conflicts:

	source/dsdb/samdb/ldb_modules/simple_ldap_map.c
(This used to be commit 5d539b7da46e38e7570fa5af4549b142f25e4585)

diff --cc source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
index 5da321b9e5aaa95f291d20981ada6e56a630f363,1830e8be7b1e7707e3c33276fb35e12a2a8abcda..6e967aab2f2061fac9fc9a1c2ff7cc17b735f8ac
--- 1/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
--- 2/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
+++ b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
@@@ -591,7 -676,10 +591,7 @@@ static int entryuuid_init(struct ldb_mo
  static int nsuniqueid_init(struct ldb_module *module)
  {
          int ret;
-       ret = ldb_map_init(module, nsuniqueid_attributes, NULL, nsuniqueid_wildcard_attributes, "samba4Top", NULL);
 -      struct map_private *map_private;
 -      struct entryuuid_private *entryuuid_private;
 -
+       ret = ldb_map_init(module, nsuniqueid_attributes, NULL, nsuniqueid_wildcard_attributes, "extensibleObject", NULL);
          if (ret != LDB_SUCCESS)
                  return ret;