ldap: qualify vars

Change-Id: Ic90146c2cd86a1fb25750f19199dbb73019b4f7b
Merge "ldap: qualify vars" into production