Merge changes I23a79eb5,I231079f3 into main

* changes:
  Add debug display of Keystore metric info
  Implement dump for IKeystoreMaintenance