[SR-Dev] git:janakj/ldap: - updated with comments received from Victor Pascual