Merge changes from topics "fp-revokeChallenge", "new-revokeChallenge" into sc-dev

* changes:
  Consolidate FingerprintManager revokeChallenge
  Consolidate revokeChallenge methods