Merge change 26190 into eclair

* changes:
  KeyStore: rename scan() to saw().