Merge remote-tracking branch 'origin/master'

platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java

@@ -25,7 +25,6 @@ import com.intellij.openapi.components.StorageScheme;
 import com.intellij.openapi.components.impl.stores.IProjectStore;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ProjectCoreUtil;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.project.ex.ProjectEx;
 import com.intellij.openapi.project.ex.ProjectManagerEx;

platform/projectModel-impl/projectModel-impl.iml

@@ -10,7 +10,6 @@
     <orderEntry type="module" module-name="projectModel-api" exported="" />
     <orderEntry type="module" module-name="core-impl" />
     <orderEntry type="library" name="Guava" level="project" />
-    <orderEntry type="module" module-name="platform-api" />
   </component>
 </module>
 

plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleNameMapper.java

@@ -18,7 +18,6 @@ package org.jetbrains.idea.maven.importing;
 import com.intellij.ide.highlighter.ModuleFileType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.util.text.StringUtil;
-import gnu.trove.TObjectIntHashMap;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.maven.model.MavenId;
 import org.jetbrains.idea.maven.project.MavenProject;