Backport subset of #4179, re-established Oracle compatibility for LDAP