fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup!...

fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Add an integrated openldap server to use in unittests