Conflicts: compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java
(partially replaces CompileJavaAgainstKotlinTest)