Revert "Merge ldap and ldap-server"

This reverts commit 78d8714b2555d941a2bac6a363534e4329113cac.