Java client updated to not use goofy keystores