[4.3]more limited ldap fix

[Daan Hoogland]

Animesh,

at your convenience please pull

5651081ac0a32ba88c7446f079a5d3a8dca47feb 'Revert "Fix findbug issues
within LDAP authenticator"'

(or revert 9776e1af1c92486f5081b1ee8fa95cf0edb86b97)

and then pull in

ce7c6d23575d455a8273b77702a56b7bb419b37b

hopefully this mitigates Rajani's concerns.

regards,
Daan