[SR-Dev] git:janakj/ldap: Merge branches 'janakj/ldap' and 'master' of ssh://janakj@ git.sip-router.org/sip-router into ldap