Fix Java integers when --no-simplify is set#1016

kroening merged 2 commits intomasterdiffblue/cbmc:masterfrom

smowton/fix/java_integers_without_simplifydiffblue/cbmc:smowton/fix/java_integers_without_simplifyCopy head branch name to clipboard