ldap : lint cleanup

Change-Id: Iee4873e9bf95fe831ca7d47b5bbabe34e3747f9c
Merge "ldap : lint cleanup" into production