Bug-22336: Fixup for keystore passwords.