Merge remote branch 'hbf/mdb.hbf' into mdb

diff --cc tests/data/slapd.conf
index 717047a19be7ee1f422f73689574c74b76b562fe,84cf7ea9792c6bf076b163b8fba88890150bd8db..0f800756c39c3cb824de0a1a421abb27f2c1ae69
--- 1/tests/data/slapd.conf
--- 2/tests/data/slapd.conf
+++ b/tests/data/slapd.conf
@@@ -42,13 -42,10 +42,11 @@@ rootdn             "cn=Manager,dc=example,dc=com
  rootpw                secret
  #null#bind            on
  #~null~#directory     @TESTDIR@/db.1.a
- #bdb#index            objectClass     eq
- #bdb#index            cn,sn,uid       pres,eq,sub
+ #indexdb#index                objectClass     eq
+ #indexdb#index                cn,sn,uid       pres,eq,sub
  #bdb#checkpoint               1024 5
- #hdb#index            objectClass     eq
- #hdb#index            cn,sn,uid       pres,eq,sub
  #hdb#checkpoint               1024 5
 +#mdb#maxsize          33554432
  #ndb#dbname db_1
  #ndb#include @DATADIR@/ndb.conf