Merge branch 'unified-builtins2' into guice-ant

Conflicts:
	src/javasources/KTool/src/org/kframework/backend/java/kil/ConstrainedTerm.java
	src/javasources/KTool/src/org/kframework/backend/java/symbolic/JavaSymbolicKRun.java
	src/javasources/KTool/src/org/kframework/backend/java/symbolic/PatternMatcher.java