Merge "Spelling fix in KeyStore.java"