Did my own phabricator comments; mostly small touches

packages/application-configuration/config.js

@@ -122,7 +122,7 @@ AppConfig.configurePackage = function (packageName, configure) {
            app.config && app.config.packages && app.config.packages[packageName],
            lastConfig)) {
       lastConfig = app.config.packages[packageName];
-      configure(_.extend({version: appConfig.version}, lastConfig));
+      configure(lastConfig);
     }
   };
   var subHandle;

packages/ctl-helper/ctl-helper.js

@@ -153,9 +153,10 @@ _.extend(Ctl, {
 
     var proxyTimeout = Meteor.setTimeout(function () {
       if (!proxyTagSwitchFuture.isResolved())
-        proxyTagSwitchFuture['throw'](new Error("timed out looking for a proxy " +
-                                                "or trying to change tags on it " +
-                                               proxy.status().status));
+        proxyTagSwitchFuture['throw'](
+          new Error("timed out looking for a proxy " +
+                    "or trying to change tags on it " +
+                    proxy.status().status));
     }, 10*1000);
     proxyTagSwitchFuture.wait();
     Meteor.clearTimeout(proxyTimeout);

packages/ctl/ctl.js

@@ -140,7 +140,9 @@ Ctl.Commands.push({
     var oldServers = jobs.find(oldJobSelector).fetch();
     // Start a new job for each of them.
     _.each(oldServers, function (oldServer) {
-      Ctl.startServerlikeProgram("server", oldServer.tags, oldServer.env.ADMIN_APP);
+      Ctl.startServerlikeProgram("server",
+                                 oldServer.tags,
+                                 oldServer.env.ADMIN_APP);
     });
     // Wait for them all to come up and bind to the proxy.
     Meteor._sleepForMs(5000); // XXX: Eventually make sure they're proxy-bound.

packages/webapp/webapp_server.js

@@ -20,6 +20,11 @@ WebAppInternals = {};
 
 var bundledJsCssPrefix;
 
+// The reload safetybelt is some js that will be loaded after everything else in
+// the HTML.  In some multi-server deployments, when you update, you have a
+// chance of hitting an old server for the HTML and the new server for the JS or
+// CSS.  This prevents you from displaying the page in that case, and instead
+// reloads it, presumably all on the new version now.
 var RELOAD_SAFETYBELT = "\n" +
       "if (typeof Meteor === 'undefined' || \n" +
       "    ! Meteor._isCssLoaded()) \n" +