Merge "Propogate userId parameter to challenge client." into sc-dev