8181370: Better keystore handling

Reviewed-by: weijun, igerasim
1 file changed