Modified LdapAPI.py and client_helper to match the master one.