Replace KotlinPackage legacy facade with corresponding package parts.

compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java

@@ -28,7 +28,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -96,7 +96,7 @@ public abstract class BaseDiagnosticsTest extends
     @Override
     protected void doMultiFileTest(File file, final Map<String, ModuleAndDependencies> modules, List<TestFile> testFiles) {
         for (final ModuleAndDependencies moduleAndDependencies : modules.values()) {
-            List<TestModule> dependencies = KotlinPackage.map(
+            List<TestModule> dependencies = CollectionsKt.map(
                     moduleAndDependencies.dependencies,
                     new Function1<String, TestModule>() {
                         @Override
@@ -347,7 +347,7 @@ public abstract class BaseDiagnosticsTest extends
 
             final boolean[] ok = { true };
             List<Diagnostic> diagnostics = ContainerUtil.filter(
-                    KotlinPackage.plus(CheckerTestUtil.getDiagnosticsIncludingSyntaxErrors(bindingContext, jetFile, markDynamicCalls, dynamicCallDescriptors),
+                    CollectionsKt.plus(CheckerTestUtil.getDiagnosticsIncludingSyntaxErrors(bindingContext, jetFile, markDynamicCalls, dynamicCallDescriptors),
                                        jvmSignatureDiagnostics),
                     whatDiagnosticsToConsider
             );