Mer modifications to support uid for LDAP

Signed-off-by: David Greaves <david.greaves@jolla.com>