8181670: Improve implementation of keystores

Reviewed-by: mullan
1 file changed