Merge change I931ce71e into eclair

* changes:
  Add unit test for the new keystore.