IDEA-116126 - NoClassDefFound on attempt to deploy to heroku

plugins/git4idea/remote-servers-git/remote-servers-git.iml

@@ -4,16 +4,16 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../sandbox/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="git4idea" exported="" />
-    <orderEntry type="module" module-name="remote-servers-impl" exported="" />
-    <orderEntry type="module" module-name="core-api" exported="" />
-    <orderEntry type="module" module-name="remote-servers-api" />
+    <orderEntry type="module" module-name="remote-servers-agent-rt" />
+    <orderEntry type="module" module-name="core-api" />
     <orderEntry type="module" module-name="vcs-api" />
+    <orderEntry type="module" module-name="remote-servers-api" />
+    <orderEntry type="module" module-name="git4idea" />
+    <orderEntry type="module" module-name="remote-servers-impl" />
     <orderEntry type="module" module-name="lang-api" />
     <orderEntry type="module" module-name="lang-impl" />
   </component>

plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudGitServerRuntimeInstanceBase.java

@@ -65,7 +65,7 @@ public abstract class CloudGitServerRuntimeInstanceBase<
   @NotNull
   @Override
   public String getDeploymentName(@NotNull DeploymentSource source) {
-    return DEFAULT_NAME_PROVIDER.getDeploymentName(source);
+    return CloudDeploymentNameProvider.DEFAULT_NAME_PROVIDER.getDeploymentName(source);
   }
 
   public void connect(final ServerConnector.ConnectionCallback<DC> callback) {