Cherry-picked fix from 1.0 branch

Fix JKSUtils problem