r18367: When converting to entryUUID, ensure we don't double-convert a