Merge tag jb8u242-b1644.3

Change-Id: Icd914a1c1383d797172faab9fc1ef399dd7a0dd2
diff --git a/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java b/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java
index 7e0d837..7fa57fc 100644
--- a/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java
+++ b/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java
@@ -1129,7 +1129,7 @@
         Util.getMessage ("Version.product", Util.getMessage ("Version.number"))));
     // <d48911> Do not introduce invalid escape characters into comment! <daz>
     //stream.println ("* " + Util.getMessage ("toJavaProlog2", Compile.compiler.arguments.file));
-    stream.println ("* " + Util.getMessage ("toJavaProlog2", Compile.compiler.arguments.file.replace (File.separatorChar, '/')));
+    //stream.println ("* " + Util.getMessage ("toJavaProlog2", Compile.compiler.arguments.file.replace (File.separatorChar, '/')));
 
     ///////////////
     // This SHOULD work, but there's a bug in the JDK.
@@ -1146,7 +1146,7 @@
     else
       formatter.setTimeZone (java.util.TimeZone.getDefault ());
 
-    stream.println ("* " + formatter.format (new Date ()));
+    //stream.println ("* " + formatter.format (new Date ()));
 
     // <daz>
     ///////////////
diff --git a/src/share/classes/com/sun/tools/corba/se/logutil/MC.java b/src/share/classes/com/sun/tools/corba/se/logutil/MC.java
index b2fd98a..c6a32a0 100644
--- a/src/share/classes/com/sun/tools/corba/se/logutil/MC.java
+++ b/src/share/classes/com/sun/tools/corba/se/logutil/MC.java
@@ -154,7 +154,7 @@
                   groupName);
     pw.println("//");
     pw.printMsg("// Generated by MC.java version @, DO NOT EDIT BY HAND!", VERSION);
-    pw.printMsg("// Generated from input file @ on @", inFile, new Date());
+    //pw.printMsg("// Generated from input file @ on @", inFile, new Date());
     pw.println();
   }