Merge pull request #1171 from rmansoor/5.0

BISERVER-10875 - SP-1055 - Fixed LDAP performance issue
ANALYZER-2199-Backing out this change as it is not the correct change to
make to fix this issue