--- a/jdk/make/src/classes/build/tools/cldrconverter/Bundle.java	Wed Aug 05 13:40:18 2015 +0300
+++ b/jdk/make/src/classes/build/tools/cldrconverter/Bundle.java	Wed Aug 05 07:41:28 2015 -0700
@@ -148,6 +148,13 @@
         return id;
     }
 
+    String getJavaID() {
+        // Tweak ISO compatibility for bundle generation
+        return id.replaceFirst("^he", "iw")
+            .replaceFirst("^id", "in")
+            .replaceFirst("^yi", "ji");
+    }
+
     boolean isRoot() {
         return "root".equals(id);
     }