BISERVER-10666-SP-710 - Added mising files from the backport of LDAP/JDBC Hybrd issues