Merge "Revert openldap dependencies for CentOS and Ubuntu"