3 files changed, 426 insertions, 498 deletions

diff --git a/java/diablo-jdk15/Makefile b/java/diablo-jdk15/Makefile
index e13ff913073b..ad3df51a91eb 100644
--- a/java/diablo-jdk15/Makefile
+++ b/java/diablo-jdk15/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -52,17 +52,12 @@ LIB_DEPENDS=	z.3:${PORTSDIR}/misc/compat6x
 .endif
 
 .if !defined(WITHOUT_TZUPDATE)
-EXTRACT_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
-TZUPDATE_VERSION=	1_3_45
-TZUPDATE_TZVERSION=	2011n
-TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${TZUPDATEFILE}
-EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
-PLIST_SUB+=		TZORIGINAL="@comment "
-PLIST_SUB+=		TZUPDATE=""
+RUN_DEPENDS+=	${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo
+PLIST_SUB+=	TZORIGINAL="@comment "
+PLIST_SUB+=	TZUPDATE=""
 .else
-PLIST_SUB+=		TZORIGINAL=""
-PLIST_SUB+=		TZUPDATE="@comment "
+PLIST_SUB+=	TZORIGINAL=""
+PLIST_SUB+=	TZUPDATE="@comment "
 .endif
 
 .if ${ARCH} == "i386"
@@ -73,7 +68,7 @@ PLIST_SUB+=	WEB="@comment "
 PLIST_SUB+=	CLIENTVM="@comment "
 .endif
 
-.if (!exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) || (!defined(WITHOUT_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE}))) && !defined(PACKAGE_BUILDING) && defined(JDK_OSREL)
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING) && defined(JDK_OSREL)
 DISTFILE_INSTRUCTIONS=\n\
 Because of licensing restrictions, you must fetch the distribution\n\
 manually.\n\n
@@ -86,12 +81,6 @@ with a web browser and \"Accept\" the End User License Agreement for\n\
 \"Caffe Diablo ${JDK_VERSION}\".  Please place the downloaded\n\
 ${DISTNAME}${EXTRACT_SUFX} in ${DISTDIR}.\n\n
 .endif
-.if !defined(WITHOUT_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})
-DISTFILE_INSTRUCTIONS += Please open http://www.oracle.com/technetwork/java/javase/downloads/index.html\n\
-in a web browser and follow the \"Download\" link for\n\
-\"JDK DST Timezone Update Tool - ${TZUPDATE_VERSION}\" to obtain the\n\
-time zone update file, ${TZUPDATEFILE}.\n\n
-.endif
 .endif
 
 pre-fetch:
@@ -101,18 +90,11 @@ pre-fetch:
 .endif
 
 .if !defined(WITHOUT_TZUPDATE)
-post-extract:
-	@${UNZIP_CMD} -qo ${DISTDIR}/${TZUPDATEFILE} -d ${WRKDIR}
-	@${UNZIP_CMD} -qo ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/tzupdater.jar -d ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/
-	@${MKDIR} ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/zi
-	@${UNZIP_CMD} -qo ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/data/tzdata${TZUPDATE_TZVERSION}.zip -d ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/zi
-
 pre-install:
 	@${ECHO_CMD} -n "Updating time zones..."
 	@${RM} -rf ${WRKSRC}/jre/lib/zi
-	@${CP} -R -f ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/zi ${WRKSRC}/jre/lib/
+	@${LN} -s -f ${LOCALBASE}/share/java/zi ${WRKSRC}/jre/lib/
 	@${ECHO_CMD} "done"
-	@-${RM} -rf ${WRKSRC}/jre/lib/zi.tzdata*
 .endif
 
 do-install:
@@ -123,7 +105,7 @@ do-install:
 post-install:
 	# Register the VM
 	"${LOCALBASE}/bin/registervm" \
-	  "${INSTALL_DIR}/bin/java # DiabloCaffe${JDK_VERSION}"
+		"${INSTALL_DIR}/bin/java # DiabloCaffe${JDK_VERSION}"
 	# Install the plugin
 	${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
diff --git a/java/diablo-jdk15/distinfo b/java/diablo-jdk15/distinfo
index cda6887071a6..6721d97bbeea 100644
--- a/java/diablo-jdk15/distinfo
+++ b/java/diablo-jdk15/distinfo
@@ -2,5 +2,3 @@ SHA256 (diablo-caffe-freebsd6-amd64-1.5.0_07-b01.tar.bz2) = 2f2964506589589ccf4c
 SIZE (diablo-caffe-freebsd6-amd64-1.5.0_07-b01.tar.bz2) = 46868094
 SHA256 (diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2) = b7e010658271bebadaa9ea1f410d7af27fcbc0f864a69feea5cd60c6683aa4c9
 SIZE (diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 54347274
-SHA256 (tzupdater-1_3_45-2011n.zip) = c0894921dd6b440b4c99daf2e139d3d240012ed09e602b3101bfcc9fac394b0f
-SIZE (tzupdater-1_3_45-2011n.zip) = 468717
diff --git a/java/diablo-jdk15/pkg-plist b/java/diablo-jdk15/pkg-plist
index e273bf01a2ed..7c1b9f75094a 100644
--- a/java/diablo-jdk15/pkg-plist
+++ b/java/diablo-jdk15/pkg-plist
@@ -1631,467 +1631,416 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/security/java.security
 %%WEB%%diablo-jdk%%JDK_VERSION%%/jre/lib/security/javaws.policy
 diablo-jdk%%JDK_VERSION%%/jre/lib/security/local_policy.jar
 diablo-jdk%%JDK_VERSION%%/jre/lib/sound.properties
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Abidjan
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Accra
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Addis_Ababa
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Algiers
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Asmara
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Abidjan
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Accra
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Addis_Ababa
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Algiers
 %%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Asmera
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bamako
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bangui
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Banjul
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bissau
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Blantyre
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Brazzaville
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bujumbura
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Cairo
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Casablanca
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Ceuta
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Conakry
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Dakar
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Dar_es_Salaam
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Djibouti
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Douala
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/El_Aaiun
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Freetown
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Gaborone
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Harare
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Johannesburg
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Juba
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Kampala
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Khartoum
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Kigali
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Kinshasa
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lagos
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Libreville
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lome
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Luanda
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lubumbashi
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lusaka
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Malabo
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Maputo
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Maseru
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Mbabane
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Mogadishu
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Monrovia
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Nairobi
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Ndjamena
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Niamey
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Nouakchott
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Ouagadougou
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Porto-Novo
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Sao_Tome
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Tripoli
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Tunis
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Windhoek
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Adak
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Anchorage
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Anguilla
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Antigua
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Araguaina
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Buenos_Aires
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Catamarca
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Cordoba
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Jujuy
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/La_Rioja
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Mendoza
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Rio_Gallegos
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Salta
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/San_Juan
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/San_Luis
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Tucuman
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Ushuaia
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Aruba
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Asuncion
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Atikokan
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Bahia
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Bahia_Banderas
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Barbados
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Belem
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Belize
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Blanc-Sablon
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Boa_Vista
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Bogota
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Boise
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Cambridge_Bay
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Campo_Grande
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Cancun
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Caracas
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Cayenne
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Cayman
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Chicago
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Chihuahua
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bamako
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bangui
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Banjul
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bissau
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Blantyre
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Brazzaville
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bujumbura
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Cairo
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Casablanca
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Ceuta
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Conakry
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Dakar
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Dar_es_Salaam
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Djibouti
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Douala
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/El_Aaiun
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Freetown
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Gaborone
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Harare
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Johannesburg
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Kampala
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Khartoum
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Kigali
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Kinshasa
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lagos
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Libreville
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lome
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Luanda
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lubumbashi
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Lusaka
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Malabo
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Maputo
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Maseru
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Mbabane
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Mogadishu
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Monrovia
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Nairobi
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Ndjamena
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Niamey
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Nouakchott
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Ouagadougou
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Porto-Novo
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Sao_Tome
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Tripoli
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Tunis
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Windhoek
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Adak
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Anchorage
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Anguilla
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Antigua
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Araguaina
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Buenos_Aires
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Catamarca
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Cordoba
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Jujuy
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/La_Rioja
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Mendoza
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Rio_Gallegos
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/San_Juan
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Tucuman
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Ushuaia
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Aruba
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Asuncion
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Bahia
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Barbados
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Belem
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Belize
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Boa_Vista
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Bogota
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Boise
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Cambridge_Bay
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Campo_Grande
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Cancun
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Caracas
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Cayenne
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Cayman
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Chicago
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Chihuahua
 %%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Coral_Harbour
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Costa_Rica
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Cuiaba
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Curacao
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Danmarkshavn
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Dawson
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Dawson_Creek
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Denver
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Detroit
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Dominica
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Edmonton
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Eirunepe
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/El_Salvador
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Fortaleza
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Glace_Bay
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Godthab
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Goose_Bay
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Grand_Turk
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Grenada
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Guadeloupe
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Guatemala
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Guayaquil
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Guyana
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Halifax
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Havana
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Hermosillo
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Indianapolis
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Knox
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Marengo
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Petersburg
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Tell_City
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Vevay
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Vincennes
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Winamac
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Inuvik
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Iqaluit
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Jamaica
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Juneau
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Kentucky/Louisville
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Kentucky/Monticello
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/La_Paz
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Lima
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Los_Angeles
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Maceio
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Managua
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Manaus
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Martinique
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Matamoros
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Mazatlan
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Menominee
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Merida
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Metlakatla
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Mexico_City
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Miquelon
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Moncton
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Monterrey
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Montevideo
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Montreal
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Montserrat
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Nassau
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/New_York
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Nipigon
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Nome
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Noronha
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/North_Dakota/Beulah
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/North_Dakota/Center
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/North_Dakota/New_Salem
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Ojinaga
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Panama
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Pangnirtung
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Paramaribo
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Phoenix
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Port-au-Prince
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Port_of_Spain
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Porto_Velho
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Puerto_Rico
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Rainy_River
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Rankin_Inlet
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Recife
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Regina
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Resolute
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Rio_Branco
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Santa_Isabel
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Santarem
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Santiago
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Santo_Domingo
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Sao_Paulo
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Scoresbysund
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Sitka
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Johns
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Kitts
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Lucia
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Thomas
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Vincent
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Swift_Current
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Tegucigalpa
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Thule
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Thunder_Bay
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Tijuana
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Toronto
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Tortola
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Vancouver
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Whitehorse
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Winnipeg
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Yakutat
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Yellowknife
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Casey
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Davis
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/DumontDUrville
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Macquarie
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Mawson
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/McMurdo
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Palmer
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Rothera
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Syowa
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Vostok
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Aden
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Almaty
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Amman
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Anadyr
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Aqtau
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Aqtobe
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Ashgabat
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Baghdad
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Bahrain
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Baku
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Bangkok
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Beirut
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Bishkek
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Brunei
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Costa_Rica
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Cuiaba
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Curacao
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Danmarkshavn
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Dawson
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Dawson_Creek
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Denver
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Detroit
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Dominica
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Edmonton
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Eirunepe
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/El_Salvador
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Fortaleza
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Glace_Bay
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Godthab
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Goose_Bay
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Grand_Turk
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Grenada
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Guadeloupe
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Guatemala
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Guayaquil
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Guyana
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Halifax
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Havana
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Hermosillo
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Indianapolis
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Knox
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Marengo
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Vevay
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Inuvik
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Iqaluit
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Jamaica
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Juneau
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Kentucky/Louisville
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Kentucky/Monticello
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/La_Paz
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Lima
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Los_Angeles
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Maceio
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Managua
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Manaus
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Martinique
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Mazatlan
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Menominee
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Merida
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Mexico_City
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Miquelon
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Monterrey
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Montevideo
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Montreal
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Montserrat
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Nassau
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/New_York
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Nipigon
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Nome
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Noronha
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/North_Dakota/Center
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Panama
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Pangnirtung
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Paramaribo
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Phoenix
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Port-au-Prince
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Port_of_Spain
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Porto_Velho
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Puerto_Rico
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Rainy_River
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Rankin_Inlet
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Recife
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Regina
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Rio_Branco
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Santiago
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Santo_Domingo
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Sao_Paulo
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Scoresbysund
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Johns
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Kitts
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Lucia
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Thomas
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Vincent
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Swift_Current
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Tegucigalpa
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Thule
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Thunder_Bay
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Tijuana
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Toronto
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Tortola
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Vancouver
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Whitehorse
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Winnipeg
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Yakutat
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Yellowknife
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Casey
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Davis
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/DumontDUrville
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Mawson
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/McMurdo
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Palmer
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Rothera
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Syowa
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica/Vostok
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Aden
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Almaty
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Amman
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Anadyr
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Aqtau
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Aqtobe
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Ashgabat
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Baghdad
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Bahrain
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Baku
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Bangkok
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Beirut
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Bishkek
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Brunei
 %%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Calcutta
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Choibalsan
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Chongqing
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Colombo
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Damascus
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dhaka
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dili
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dubai
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dushanbe
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Gaza
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Harbin
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hebron
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Ho_Chi_Minh
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hong_Kong
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hovd
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Irkutsk
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Jakarta
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Jayapura
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Jerusalem
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kabul
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kamchatka
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Karachi
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kashgar
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Choibalsan
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Chongqing
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Colombo
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Damascus
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dhaka
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dili
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dubai
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dushanbe
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Gaza
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Harbin
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hong_Kong
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hovd
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Irkutsk
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Jakarta
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Jayapura
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Jerusalem
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kabul
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kamchatka
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Karachi
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kashgar
 %%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Katmandu
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kathmandu
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kolkata
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Krasnoyarsk
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kuala_Lumpur
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kuching
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kuwait
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Macau
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Magadan
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Makassar
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Manila
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Muscat
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Nicosia
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Novokuznetsk
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Novosibirsk
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Omsk
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Oral
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Phnom_Penh
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Pontianak
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Pyongyang
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Qatar
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Qyzylorda
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Rangoon
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh87
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh88
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh89
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Krasnoyarsk
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kuala_Lumpur
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kuching
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kuwait
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Macau
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Magadan
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Makassar
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Manila
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Muscat
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Nicosia
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Novosibirsk
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Omsk
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Oral
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Phnom_Penh
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Pontianak
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Pyongyang
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Qatar
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Qyzylorda
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Rangoon
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh87
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh88
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh89
 %%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Saigon
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Sakhalin
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Samarkand
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Seoul
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Shanghai
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Singapore
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Taipei
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tashkent
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tbilisi
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tehran
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Thimphu
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tokyo
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Ulaanbaatar
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Urumqi
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Vientiane
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Vladivostok
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Yakutsk
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Yekaterinburg
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Yerevan
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Azores
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Bermuda
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Canary
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Cape_Verde
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Sakhalin
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Samarkand
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Seoul
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Shanghai
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Singapore
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Taipei
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tashkent
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tbilisi
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tehran
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Thimphu
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Tokyo
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Ulaanbaatar
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Urumqi
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Vientiane
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Vladivostok
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Yakutsk
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Yekaterinburg
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Yerevan
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Azores
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Bermuda
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Canary
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Cape_Verde
 %%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Faeroe
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Faroe
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Madeira
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Reykjavik
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/South_Georgia
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/St_Helena
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Stanley
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Adelaide
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Brisbane
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Broken_Hill
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Currie
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Darwin
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Eucla
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Hobart
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Lindeman
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Lord_Howe
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Melbourne
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Perth
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Sydney
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/CET
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/CST6CDT
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/EET
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/EST
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/EST5EDT
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+1
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+10
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+11
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+12
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+2
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+3
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+4
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+5
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+6
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+7
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+8
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+9
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-1
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-10
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-11
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-12
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-13
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-14
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-2
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-3
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-4
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-5
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-6
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-7
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-8
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-9
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/UCT
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/UTC
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Amsterdam
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Andorra
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Athens
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Belgrade
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Berlin
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Brussels
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Bucharest
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Budapest
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Chisinau
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Copenhagen
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Dublin
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Gibraltar
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Helsinki
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Istanbul
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Kaliningrad
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Kiev
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Lisbon
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/London
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Luxembourg
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Madrid
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Malta
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Minsk
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Monaco
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Moscow
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Oslo
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Paris
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Prague
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Riga
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Rome
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Samara
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Simferopol
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Sofia
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Stockholm
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Tallinn
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Tirane
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Uzhgorod
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vaduz
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vienna
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vilnius
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Volgograd
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Warsaw
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Zaporozhye
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Zurich
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/GMT
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/HST
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Antananarivo
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Chagos
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Christmas
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Cocos
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Comoro
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Kerguelen
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mahe
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Maldives
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mauritius
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mayotte
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Reunion
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/MET
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/MST
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/MST7MDT
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/PST8PDT
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Apia
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Auckland
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Chatham
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Chuuk
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Easter
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Efate
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Enderbury
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Fakaofo
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Fiji
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Funafuti
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Galapagos
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Gambier
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Guadalcanal
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Guam
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Honolulu
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Johnston
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Kiritimati
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Kosrae
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Kwajalein
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Majuro
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Marquesas
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Midway
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Nauru
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Niue
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Norfolk
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Noumea
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Pago_Pago
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Palau
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Pitcairn
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Madeira
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Reykjavik
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/South_Georgia
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/St_Helena
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Stanley
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Adelaide
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Brisbane
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Broken_Hill
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Currie
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Darwin
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Hobart
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Lindeman
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Lord_Howe
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Melbourne
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Perth
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Sydney
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/CET
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/EET
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+1
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+10
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+11
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+12
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+2
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+3
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+4
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+5
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+6
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+7
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+8
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+9
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-1
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-10
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-11
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-12
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-13
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-14
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-2
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-3
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-4
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-5
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-6
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-7
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-8
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT-9
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/UCT
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/UTC
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Amsterdam
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Andorra
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Athens
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Belgrade
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Berlin
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Brussels
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Bucharest
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Budapest
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Chisinau
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Copenhagen
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Dublin
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Gibraltar
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Helsinki
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Istanbul
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Kaliningrad
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Kiev
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Lisbon
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/London
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Luxembourg
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Madrid
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Malta
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Minsk
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Monaco
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Moscow
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Oslo
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Paris
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Prague
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Riga
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Rome
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Samara
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Simferopol
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Sofia
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Stockholm
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Tallinn
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Tirane
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Uzhgorod
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vaduz
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vienna
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vilnius
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Warsaw
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Zaporozhye
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Zurich
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/GMT
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Antananarivo
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Chagos
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Christmas
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Cocos
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Comoro
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Kerguelen
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mahe
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Maldives
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mauritius
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mayotte
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Reunion
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/MET
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Apia
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Auckland
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Chatham
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Easter
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Efate
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Enderbury
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Fakaofo
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Fiji
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Funafuti
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Galapagos
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Gambier
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Guadalcanal
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Guam
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Honolulu
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Johnston
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Kiritimati
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Kosrae
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Kwajalein
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Majuro
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Marquesas
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Midway
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Nauru
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Niue
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Norfolk
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Noumea
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Pago_Pago
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Palau
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Pitcairn
 %%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Ponape
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Pohnpei
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Port_Moresby
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Rarotonga
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Saipan
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Tahiti
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Tarawa
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Tongatapu
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Port_Moresby
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Rarotonga
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Saipan
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Tahiti
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Tarawa
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Tongatapu
 %%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Truk
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wake
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wallis
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/AST4
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/AST4ADT
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/CST6
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/CST6CDT
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/EST5
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/EST5EDT
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/HST10
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/MST7
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/MST7MDT
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/PST8
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/PST8PDT
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/YST9
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/YST9YDT
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/WET
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/ZoneInfoMappings
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wake
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wallis
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/WET
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/ZoneInfoMappings
 %%WEB%%diablo-jdk%%JDK_VERSION%%/jre/plugin/desktop/sun_java.desktop
 %%WEB%%diablo-jdk%%JDK_VERSION%%/jre/plugin/desktop/sun_java.png
 %%WEB%%diablo-jdk%%JDK_VERSION%%/jre/plugin/%%ARCH%%/ns7/libjavaplugin_oji.so
@@ -2381,22 +2330,21 @@ diablo-jdk%%JDK_VERSION%%/src.zip
 %%WEB%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/plugin/%%ARCH%%
 %%WEB%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/plugin/desktop
 %%WEB%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/plugin
-%%TZUPDATE%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV
-@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific
-@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian
-@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe
-@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc
-@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia
-@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic
-@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia
-@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica
-@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/North_Dakota
-@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Kentucky
-@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana
-@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina
-@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America
-@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa
-@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi
+%%TZORIGINAL%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific
+%%TZORIGINAL%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian
+%%TZORIGINAL%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe
+%%TZORIGINAL%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc
+%%TZORIGINAL%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia
+%%TZORIGINAL%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic
+%%TZORIGINAL%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia
+%%TZORIGINAL%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Antarctica
+%%TZORIGINAL%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/North_Dakota
+%%TZORIGINAL%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Kentucky
+%%TZORIGINAL%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana
+%%TZORIGINAL%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina
+%%TZORIGINAL%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America
+%%TZORIGINAL%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa
+%%TZORIGINAL%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi
 @dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/security
 @dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/oblique-fonts
 @dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/management