LDAP-related fixes

Change-Id: I2aeeedae180064a66fa943b21fa3b69c89b347f7
4 files changed