Merge changes from topic "clientmonitor-cleanup5"

* changes:
  29/n: Fix EnrollClient onClientFinished
  28/n: Move authenticatorId update to RemovalClient
  27/n: Slightly update/fix ClientMonitor.FinishCallback
  26/n: Move ClientActiveCallbacks to its own file
  25/n: Make InternalCleanupClient generics/templates more correct
  24/n: Use lazy retrieval for HAL
  23/n: Move LockoutResetCallback tracking to its own class