Merge change 10320

* changes:
  Fixed typo, RFC3296 is for LDAP, RFC2396 is for URI