Index: admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/V2ToV3ConfigUpgrade.java
===================================================================
--- admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/V2ToV3ConfigUpgrade.java	(revision 44340)
+++ admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/V2ToV3ConfigUpgrade.java	(working copy)
@@ -166,6 +166,7 @@
         "-Dfelix.fileinstall.debug=3",
         "-Dfelix.fileinstall.bundles.new.start=true",
         "-Dfelix.fileinstall.bundles.startTransient=true",
+        "-Dfelix.fileinstall.disableConfigSave=false",
         "-Dfelix.fileinstall.log.level=2",
         "-Djavax.management.builder.initial=com.sun.enterprise.v3.admin.AppServerMBeanServerBuilder",
         "-Dorg.glassfish.web.rfc2109_cookie_names_enforced=false",
Index: packager/nucleus-base/lib/templates/domain.xml
===================================================================
--- packager/nucleus-base/lib/templates/domain.xml	(revision 44340)
+++ packager/nucleus-base/lib/templates/domain.xml	(working copy)
@@ -212,6 +212,10 @@
         <jvm-options>-Dfelix.fileinstall.bundles.new.start=true</jvm-options>
         <!-- should watched bundles be started transiently or persistently -->
         <jvm-options>-Dfelix.fileinstall.bundles.startTransient=true</jvm-options>
+        <!-- Should changes to configuration be saved in corresponding cfg file? false: no, true: yes
+             If we don't set false, everytime server starts from clean osgi cache, the file gets rewritten.
+        -->
+        <jvm-options>-Dfelix.fileinstall.disableConfigSave=false</jvm-options>
         <!-- End of OSGi bundle configurations -->
         <jvm-options>-XX:NewRatio=2</jvm-options>
       </java-config>
@@ -382,6 +386,10 @@
              <jvm-options>-Dfelix.fileinstall.bundles.new.start=true</jvm-options>
              <!-- should watched bundles be started transiently or persistently -->
              <jvm-options>-Dfelix.fileinstall.bundles.startTransient=true</jvm-options>
+             <!-- Should changes to configuration be saved in corresponding cfg file? false: no, true: yes
+                  If we don't set false, everytime server starts from clean osgi cache, the file gets rewritten.
+             -->
+             <jvm-options>-Dfelix.fileinstall.disableConfigSave=false</jvm-options>
              <!-- End of OSGi bundle configurations -->
         </java-config>
          <availability-service>
Index: osgi-platforms/felix/pom.xml
===================================================================
--- osgi-platforms/felix/pom.xml	(revision 44340)
+++ 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.0.2</version>
+                               <version>3.1.4</version>
                                <type>jar</type>
                                <outputDirectory>${glassfish.modulesdir}</outputDirectory>
                              </artifactItem>