merge from 3.0...LDAP password lockout support