Merge branch 'v4-0-test' into id10ts-registry

(This used to be commit f98b59021a5ea39c7970ebc5520d17775e500b8c)

diff --cc source4/lib/registry/ldb.c
Simple merge

diff --cc source4/lib/registry/regf.c
Simple merge

diff --cc source4/lib/registry/tests/hive.c
Simple merge