Merge change 26794 into eclair

* changes:
  keystore: remove old implementation and test.