Added test cases for the LDAP test suite.
Merge remote-tracking branch 'upstream2/master'