Consolidated UserIdExtractor and UserIdSource in core, requiring adjustments in Spring Social Twitter