Merge "Fix LDAP connection pool configuration."