Merge branch 'master' into smt

Conflicts:
	java-backend/src/main/java/org/kframework/backend/java/ksimulation/Adjuster.java
	k-core/src/main/java/org/kframework/backend/symbolic/AddPathCondition.java