Merge changes I3f1e81c1,I1a95efa5,I3b5d6732

* changes:
  Keystore 2.0: Fix map_or_log_err documentation
  Keystore 2.0: Fix holding mutex for to long
  Keystore 2.0: Initialize thread pool.