Merge changes I803b7c19,I7097646b

* changes:
  Keystore 2.0: Restrict list to KeyType::Client.
  Keystore 2.0: CLI fixes.