Add configurable LDAP_OPT_DEREF option (#1489864) - patch from Stuart C. Naifeh

Conflicts:

	CHANGELOG