Merge change 26786 into eclair

* changes:
  Remove old keystore and related files.