Merge change 26793 into eclair

* changes:
  KeyStore: remove classes used by old keystore.