Merge changes I001adb29,Ie06f6fb4,I976073ab,I7c1e2321

* changes:
  Keystore 2.0: Handle stale unreferenced keys.
  Keystore 2.0: make clean namespace query more precise.
  Keystore 2.0: Remove clippy exception.
  Keystore 2.0: Revisit GC.