Added NonLocalExit instead of ArithmeticException.
revert liyili2
revert liyi commit
Merge remote-tracking branch 'origin/nightly'

Conflicts:
	src/javasources/KTool/src/org/kframework/backend/java/ksimulation/Waitor.java