Index: core/kernel/src/main/java/org/glassfish/kernel/GlassFishActivator.java
===================================================================
--- core/kernel/src/main/java/org/glassfish/kernel/GlassFishActivator.java	(revision 45139)
+++ core/kernel/src/main/java/org/glassfish/kernel/GlassFishActivator.java	(working copy)
@@ -217,9 +217,7 @@
                     "org.apache.felix.shell, " +
                     "org.apache.felix.gogo.runtime, " +
                     "org.apache.felix.gogo.shell, " +
-                    "org.apache.felix.gogo.command, " +
-                    "org.apache.felix.shell.remote, " +
-                    "org.apache.felix.fileinstall";
+                    "org.apache.felix.gogo.command";
         }
         for (String bsn : additionalOSGiBundlesToStart.split(",")) {
             startBundle(bsn.trim());
Index: osgi-platforms/felix/pom.xml
===================================================================
--- osgi-platforms/felix/pom.xml	(revision 45139)
+++ osgi-platforms/felix/pom.xml	(working copy)
@@ -156,7 +156,7 @@
                              <artifactItem>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>org.apache.felix.fileinstall</artifactId>
-                               <version>3.1.6</version>
+                               <version>3.1.10</version>
                                <type>jar</type>
                                <outputDirectory>${glassfish.modulesdir}</outputDirectory>
                              </artifactItem>
Index: packager/nucleus-base/lib/templates/domain.xml
===================================================================
--- packager/nucleus-base/lib/templates/domain.xml	(revision 45139)
+++ packager/nucleus-base/lib/templates/domain.xml	(working copy)
@@ -191,8 +191,11 @@
 		<jvm-options>-DANTLR_USE_DIRECT_CLASS_LOADING=true</jvm-options>
         <jvm-options>-Dcom.sun.enterprise.config.config_environment_factory_class=com.sun.enterprise.config.serverbeans.AppserverConfigEnvironmentFactory</jvm-options>
          <!-- Configure post startup bundle list here. This is a comma separated list of bundle sybolic names.
-              The remote shell bundle has been disabled in fcs build for DAS as well. -->
-         <jvm-options>-Dorg.glassfish.additionalOSGiBundlesToStart=org.apache.felix.shell,org.apache.felix.gogo.runtime,org.apache.felix.gogo.shell,org.apache.felix.gogo.command,org.apache.felix.fileinstall</jvm-options>
+              The remote shell bundle has been disabled in fcs build for DAS as well. 
+              Because of the late minute bug (15967), we have decided to turn off fileinstall in all configurations by default.
+              Anyone using fileinstall is requested to add org.apache.felix.fileinstall to the list below.
+         -->
+         <jvm-options>-Dorg.glassfish.additionalOSGiBundlesToStart=org.apache.felix.shell,org.apache.felix.gogo.runtime,org.apache.felix.gogo.shell,org.apache.felix.gogo.command</jvm-options>
         <!-- Configuration of various third-party OSGi bundles like
              Felix Remote Shell, FileInstall, etc. -->
         <!-- Port on which remote shell listens for connections.-->
@@ -370,8 +373,11 @@
              <jvm-options>-XX:NewRatio=2</jvm-options>
              <jvm-options>-Xmx512m</jvm-options>
              <!-- Configure post startup bundle list here. This is a comma separated list of bundle sybolic names.
-                  The remote shell bundle has been disabled for cluster and remote instances. -->
-             <jvm-options>-Dorg.glassfish.additionalOSGiBundlesToStart=org.apache.felix.shell,org.apache.felix.gogo.runtime,org.apache.felix.gogo.shell,org.apache.felix.gogo.command,org.apache.felix.fileinstall</jvm-options>
+                  The remote shell bundle has been disabled for cluster and remote instances.
+                  Because of the late minute bug (15967), we have decided to turn off fileinstall in all configurations by default.
+                  Anyone using fileinstall is requested to add org.apache.felix.fileinstall to the list below.
+             -->
+             <jvm-options>-Dorg.glassfish.additionalOSGiBundlesToStart=org.apache.felix.shell,org.apache.felix.gogo.runtime,org.apache.felix.gogo.shell,org.apache.felix.gogo.command</jvm-options>
              <!-- Port on which remote shell listens for connections.-->
              <jvm-options>-Dosgi.shell.telnet.port=${OSGI_SHELL_TELNET_PORT}</jvm-options>
              <!-- How many concurrent users can connect to this remote shell -->