GATEWAY-3390 subtask GATEWAY-3438: removed dependency on JKS.
GATEWAY-3390: merging fix for JKS dependency.