Consolidated UserIdSource with UserIdExtractor and moved to core project.