diff -r d6c20e38a0f7 -r c6b5d4730d84 components/tomcat-8/patches/setenv.patch
--- a/components/tomcat-8/patches/setenv.patch	Wed Jun 22 07:46:07 2016 -0700
+++ b/components/tomcat-8/patches/setenv.patch	Tue Jun 21 01:51:01 2016 -0700
@@ -5,7 +5,7 @@
 
 --- bin/catalina.sh
 +++ bin/catalina.sh
-@@ -145,7 +146,13 @@
+@@ -138,7 +139,13 @@
  # but allow them to be specified in setenv.sh, in rare case when it is needed.
  CLASSPATH=
  
@@ -22,7 +22,7 @@
    . "$CATALINA_HOME/bin/setenv.sh"
 --- bin/tool-wrapper.sh
 +++ bin/tool-wrapper.sh
-@@ -73,8 +75,16 @@
+@@ -67,8 +69,16 @@
  # but allow them to be specified in setenv.sh, in rare case when it is needed.
  CLASSPATH=