Merge branch 'unified-builtins2' into krun-options

Conflicts:
	src/javasources/KTool/src/org/kframework/krun/Main.java
	src/javasources/KTool/src/org/kframework/ktest/Test/TestCase.java