Merge changes from topic "user-id-again" into sc-dev

* changes:
  Add userId parameter to all uses of challenge client.
  Cache challenge response in Face10 implementation.