Merge pull request #719 from mfournier/openldap-improvements-rebased