[SR-Dev] git:janakj/ldap: Merge commit 'ldap/master' into ldap