MPS-17667 Can't import tests from source code
Merge remote-tracking branch 'origin/MPS2.5'

Conflicts:
	plugins/mpsjava/platform/models/parser.mps
	plugins/mpsjava/platform/source_gen.caches/jetbrains/mps/ide/java/parser/generated
	plugins/mpsjava/platform/source_gen/jetbrains/mps/ide/java/parser/JavaCompiler.java
	plugins/mpsjava/platform/source_gen/jetbrains/mps/ide/java/parser/trace.info