Fix user locator adapter used in group ID lookup.
Merge master.