Merge "Reduce number of LDAP queries when having multiple accountBases"