Merge "Return user ID as userid in watchlist API module"