Merge pull request #285 from sivakuna-aap/master

[SD-668]: Fix LDAP integration