diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf b/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
index 37ec474575..6208560ffb 100644
--- a/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
+++ b/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf
@@ -1,3 +1,9 @@
+# Java command to use when running NiFi
+java=java
+
+# Username to use when running NiFi. This value will be ignored on Windows.
+run.as=
+
 # Configure where NiFi's lib and conf directories live
 lib.dir=./lib
 conf.dir=./conf
@@ -15,8 +21,14 @@ java.arg.3=-Xmx512m
 # Enable Remote Debugging
 #java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
 
-# Java command to use when running NiFi
-java=java
+java.arg.4=-Djava.net.preferIPv4Stack=true
 
-# Username to use when running NiFi. This value will be ignored on Windows.
-run.as=
+# allowRestrictedHeaders is required for Cluster/Node communications to work properly
+java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
+java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
+
+# Java 7 and below have issues with Code Cache. The following lines allow us to run well even with
+# many classes loaded in the JVM.
+java.arg.7=-XX:+ReservedCodeCacheSize=256m
+java.arg.8=-XX:CodeCacheFlushingMinimumFreeSpace=10m
+java.arg.9=-XX:+UseCodeCacheFlushing