Merge pull request #1308 from mfournier/openldap-persistent-connection