Resolved problem with including str files instead of rtrees
Merge commit '53988e2119f639f4175c457c241df538747e9f52' into separate-compilation-bootstrap

Conflicts:
	strategoxt/stratego-libraries/java-backend/trans/separate-compilation.str