Fixed java parsing test
Little clean-up in DirParser
Merge branch '3.0/danya'

Conflicts:
	plugins/mpsjava/basePlatform/models/jetbrains/mps/ide/java/parser.mps
	plugins/mpsjava/basePlatform/source_gen.caches/jetbrains/mps/ide/java/newparser/generated
	plugins/mpsjava/jetbrains.mps.ide.java.tests/models/jetbrains/mps/ide/java/tests/utility.mps
	plugins/mpsjava/jetbrains.mps.ide.java.tests/source_gen.caches/jetbrains/mps/ide/java/tests/utility/generated
Resolved conflicts and regenerated