Revert "Revert "[Trivial] fix sdk issues""

package.json

@@ -102,8 +102,8 @@
         "c9.ide.recentfiles": "#7c099abf40",
         "c9.ide.remote": "#301d2ab519",
         "c9.ide.processlist": "#bc11818bb5",
-        "c9.ide.run": "#cf9345a012",
-        "c9.ide.run.build": "#26fa628677",
+        "c9.ide.run": "#c53178c339",
+        "c9.ide.run.build": "#0598fff697",
         "c9.ide.run.debug.xdebug": "#61dcbd0180",
         "c9.ide.save": "#326087f5a2",
         "c9.ide.scm": "#f3847917b8",

plugins/c9.ide.ui/forms.js

@@ -477,8 +477,12 @@ define(function(require, exports, module) {
                     container.parentNode = htmlNode;
                     htmlNode = htmlNode.$int;
                 }
-                
-                htmlNode.insertBefore(container.$ext, beforeNode || null);
+                // if we have apf node, make sure apf child-parent links do not get broken
+                if (htmlNode.host && container.host) {
+                    htmlNode.host.insertBefore(container.host, beforeNode && beforeNode.host);
+                } else {
+                    htmlNode.insertBefore(container.$ext, beforeNode || null);
+                }
                 show();
             }