Permit use of SSL options for LDAP client connections.
Correct version check.
Merge in default.
Merged bug25839 into default