Revert "user story #2047, install ldap..."

This reverts commit f5421e78e9edf2f63a0c6a1a642c6a4ffdc84d89
Revert "cleanup..."

This reverts commit bac8268cc7508c67c143f7044f4d2181b4861c48
Merge "Revert "user story #2047, install ldap...""