Merge changes from topic "clientmonitor-cleanup6"

* changes:
  31/n: Move Fingerprint2.1 into a wrapper with its own scheduler
  30/n: Combine ErrorConsumer and Cancellable