Merge pull request #8021 from val-kulkov/openldap-package