Fixed import of transitive HMPP dependencies

#KT-36792 Fixed

idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt

@@ -616,8 +616,6 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
                 gradleCompilation.name,
                 classifier
             )]?.dependencies?.map { dependencyMapper.getDependency(it) }?.filterNotNull() ?: emptySet()
-
-            makeConfigurationNamesDefault(dependencyMapper)
         }
     }
 
@@ -825,6 +823,8 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
     ) {
         private val adjustmentMap = HashMap<ExternalDependency, List<ExternalDependency>>()
 
+        private val EXTRA_DEFAULT_CONFIGURATION_NAMES = listOf("metadataApiElements")
+
         private val projectDependencyTransformation =
             transformations.filter { it.projectPath != null }.associateBy { it.projectPath }
 
@@ -899,7 +899,8 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
             return adjustmentMap.getOrPut(dependency) {
                 if (dependency !is ExternalProjectDependency)
                     return@getOrPut adjustLibraryDependency(dependency, parentScope)
-                if (dependency.configurationName != Dependency.DEFAULT_CONFIGURATION)
+                if (dependency.configurationName != Dependency.DEFAULT_CONFIGURATION &&
+                    !EXTRA_DEFAULT_CONFIGURATION_NAMES.contains(dependency.configurationName))
                     return@getOrPut listOf(dependency)
                 val artifacts = dependenciesByProjectPath[dependency.projectPath] ?: return@getOrPut listOf(dependency)
                 val artifactConfiguration = artifacts.mapTo(LinkedHashSet()) {

idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilderBunch.kt

@@ -1,10 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.gradle
-
-//BUNCH: 193
-fun makeConfigurationNamesDefault(dependencyMapper: KotlinDependencyMapper) {
-}

idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilderBunch.kt.201

@@ -1,15 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.gradle
-
-import org.jetbrains.plugins.gradle.model.DefaultExternalProjectDependency
-
-//BUNCH: 193
-fun makeConfigurationNamesDefault(dependencyMapper: KotlinDependencyMapper) {
-    dependencyMapper.toDependencyMap().values.forEach {
-        (it as? DefaultExternalProjectDependency)?.configurationName = "default"
-    }
-}