# HG changeset patch
# User ihse
# Date 1494327450 -7200
# Node ID b0ea3c0bfb817d9518fb3b3887acad0f565dedbe
# Parent  0cf367e546fba1629aa19bad0edd71d9d612b808
8179889: Fix typographic errors in copyright headers
Reviewed-by: erikj, dholmes

diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/src/java.base/macosx/native/libnet/DefaultProxySelector.c
--- a/jdk/src/java.base/macosx/native/libnet/DefaultProxySelector.c	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/src/java.base/macosx/native/libnet/DefaultProxySelector.c	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2017 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/src/java.base/share/classes/com/sun/crypto/provider/GCTR.java
--- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/GCTR.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/GCTR.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/src/java.base/share/classes/sun/security/util/ConstraintsParameters.java
--- a/jdk/src/java.base/share/classes/sun/security/util/ConstraintsParameters.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/util/ConstraintsParameters.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/src/java.base/share/native/libjimage/endian.hpp
--- a/jdk/src/java.base/share/native/libjimage/endian.hpp	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/src/java.base/share/native/libjimage/endian.hpp	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/src/java.base/share/native/libjimage/imageDecompressor.cpp
--- a/jdk/src/java.base/share/native/libjimage/imageDecompressor.cpp	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/src/java.base/share/native/libjimage/imageDecompressor.cpp	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/src/java.base/share/native/libjimage/imageDecompressor.hpp
--- a/jdk/src/java.base/share/native/libjimage/imageDecompressor.hpp	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/src/java.base/share/native/libjimage/imageDecompressor.hpp	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/src/java.base/share/native/libjimage/imageFile.hpp
--- a/jdk/src/java.base/share/native/libjimage/imageFile.hpp	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/src/java.base/share/native/libjimage/imageFile.hpp	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/src/java.base/share/native/libjimage/inttypes.hpp
--- a/jdk/src/java.base/share/native/libjimage/inttypes.hpp	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/src/java.base/share/native/libjimage/inttypes.hpp	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -47,4 +47,3 @@
 #endif
 
 #endif // LIBJIMAGE_INTTYPES_HPP
-
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/src/java.base/share/native/libjimage/jimage.hpp
--- a/jdk/src/java.base/share/native/libjimage/jimage.hpp	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/src/java.base/share/native/libjimage/jimage.hpp	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -202,4 +202,3 @@
 
 typedef bool (*JImage_ResourcePath_t)(JImageFile* jimage, JImageLocationRef location,
         char* buffer, jlong size);
-
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/src/java.base/share/native/libjimage/osSupport.hpp
--- a/jdk/src/java.base/share/native/libjimage/osSupport.hpp	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/src/java.base/share/native/libjimage/osSupport.hpp	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/src/java.desktop/share/classes/sun/swing/LightweightContent.java
--- a/jdk/src/java.desktop/share/classes/sun/swing/LightweightContent.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/src/java.desktop/share/classes/sun/swing/LightweightContent.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowUpdateSender.java
--- a/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowUpdateSender.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowUpdateSender.java	Tue May 09 12:57:30 2017 +0200
@@ -20,6 +20,7 @@
  *
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 package jdk.incubator.http;
 
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/apple/laf/ScreenMenu/ScreenMenuMemoryLeakTest.java
--- a/jdk/test/com/apple/laf/ScreenMenu/ScreenMenuMemoryLeakTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/apple/laf/ScreenMenu/ScreenMenuMemoryLeakTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -102,4 +102,4 @@
         Objects.requireNonNull(menuItem, "The menu item should still be available at this point");
         sMenu.remove(menuItem);
     }
-}
\ No newline at end of file
+}
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/crypto/provider/Cipher/AES/TestCICOWithGCMAndAAD.java
--- a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestCICOWithGCMAndAAD.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestCICOWithGCMAndAAD.java	Tue May 09 12:57:30 2017 +0200
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have
+ * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/ArrayLengthDumpTest.sh
--- a/jdk/test/com/sun/jdi/ArrayLengthDumpTest.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/ArrayLengthDumpTest.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2002, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -98,7 +98,7 @@
 
     for ii in . $TESTSRC $TESTSRC/.. ; do
         if [ -r "$ii/ShellScaffold.sh" ] ; then
-            . $ii/ShellScaffold.sh 
+            . $ii/ShellScaffold.sh
             break
         fi
     done
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/BreakpointWithFullGC.sh
--- a/jdk/test/com/sun/jdi/BreakpointWithFullGC.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/BreakpointWithFullGC.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2009, 2013 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/CatchAllTest.sh
--- a/jdk/test/com/sun/jdi/CatchAllTest.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/CatchAllTest.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2002, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -76,7 +76,7 @@
 
     for ii in . $TESTSRC $TESTSRC/.. ; do
         if [ -r "$ii/ShellScaffold.sh" ] ; then
-            . $ii/ShellScaffold.sh 
+            . $ii/ShellScaffold.sh
             break
         fi
     done
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/CatchCaughtTest.sh
--- a/jdk/test/com/sun/jdi/CatchCaughtTest.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/CatchCaughtTest.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2002, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,7 @@
 
     for ii in . $TESTSRC $TESTSRC/.. ; do
         if [ -r "$ii/ShellScaffold.sh" ] ; then
-            . $ii/ShellScaffold.sh 
+            . $ii/ShellScaffold.sh
             break
         fi
     done
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/CatchPatternTest.sh
--- a/jdk/test/com/sun/jdi/CatchPatternTest.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/CatchPatternTest.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2002, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -108,7 +108,7 @@
 
     for ii in . $TESTSRC $TESTSRC/.. ; do
         if [ -r "$ii/ShellScaffold.sh" ] ; then
-            . $ii/ShellScaffold.sh 
+            . $ii/ShellScaffold.sh
             break
         fi
     done
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/CommandCommentDelimiter.sh
--- a/jdk/test/com/sun/jdi/CommandCommentDelimiter.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/CommandCommentDelimiter.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2004, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -70,7 +70,7 @@
 
     for ii in . $TESTSRC $TESTSRC/.. ; do
         if [ -r "$ii/ShellScaffold.sh" ] ; then
-            . $ii/ShellScaffold.sh 
+            . $ii/ShellScaffold.sh
             break
         fi
     done
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/DeferredStepTest.sh
--- a/jdk/test/com/sun/jdi/DeferredStepTest.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/DeferredStepTest.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2002, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@
   static class  jj1 implements Runnable {
     public void  run() {
         int count = 0;
-        
+
         for ( int ii = 0; ii < 10; ii++) {  // line 6
             int intInPotato04 = 666;        // line 7
             ++count;                        // line 8; @1 breakpoint
@@ -65,7 +65,7 @@
   static class jj2 implements Runnable {
     public void run() {
         int count2 = 0;
-        
+
         for (int ii = 0; ii < 10; ii++) {      // line 18
             String StringInPotato05 = "I am";  // line 19
             ++count2;                          // line 20; @1 breakpoint
@@ -139,7 +139,7 @@
 
     for ii in . $TESTSRC $TESTSRC/.. ; do
         if [ -r "$ii/ShellScaffold.sh" ] ; then
-            . $ii/ShellScaffold.sh 
+            . $ii/ShellScaffold.sh
             break
         fi
     done
@@ -157,7 +157,7 @@
 If this works right, you should see StepEvents/Breakpoint events for lines
    8, 9, 6, 7, 8, 9, 6, ....   for thread jj11
 and
-  20, 21, 18, 19, 20, 21, 18, ... for thread jj2 
+  20, 21, 18, 19, 20, 21, 18, ... for thread jj2
 
 Since both threads are running at the same time, these
 events can be intermixed.
@@ -179,5 +179,5 @@
 
 EOF
 runit
-#jdbFailIfPresent "Nothing suspended" 
+#jdbFailIfPresent "Nothing suspended"
 #pass
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/DeoptimizeWalk.sh
--- a/jdk/test/com/sun/jdi/DeoptimizeWalk.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/DeoptimizeWalk.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2002, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -96,7 +96,7 @@
 
     for ii in . $TESTSRC $TESTSRC/.. ; do
         if [ -r "$ii/ShellScaffold.sh" ] ; then
-            . $ii/ShellScaffold.sh 
+            . $ii/ShellScaffold.sh
             break
         fi
     done
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/EvalArgs.sh
--- a/jdk/test/com/sun/jdi/EvalArgs.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/EvalArgs.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2002, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 #  @test
 #  @bug 4663146
-#  @summary Arguments match no method error 
+#  @summary Arguments match no method error
 #  @author Jim Holmlund/Suvasis
 #
 #  @run shell/timeout=300 EvalArgs.sh
@@ -72,13 +72,13 @@
         System.out.println( ffjj1(myjj1));
         System.out.println( ffjj1(myjj2));
 
-        System.out.println("$classname.ffoverload($classname.jjboolean) = " + 
+        System.out.println("$classname.ffoverload($classname.jjboolean) = " +
                             $classname.ffoverload($classname.jjboolean));
-        System.out.println("$classname.ffoverload($classname.jjbyte) = " + 
+        System.out.println("$classname.ffoverload($classname.jjbyte) = " +
                             $classname.ffoverload($classname.jjbyte));
-        System.out.println("$classname.ffoverload($classname.jjchar) = " + 
+        System.out.println("$classname.ffoverload($classname.jjchar) = " +
                             $classname.ffoverload($classname.jjchar));
-        System.out.println("$classname.ffoverload($classname.jjdouble) = " + 
+        System.out.println("$classname.ffoverload($classname.jjdouble) = " +
                             $classname.ffoverload($classname.jjdouble));
 
 
@@ -94,11 +94,11 @@
     public static String ffjj1(jj1 arg) {
         return arg.me;
     }
-    
+
     public static String ffjj2(jj2 arg) {
         return arg.me;
     }
-    
+
     static String ffboolean(boolean p1) {
         return "ffbool: p1 = " + p1;
     }
@@ -106,31 +106,31 @@
     static String ffbyte(byte p1) {
         return "ffbyte: p1 = " + p1;
     }
-        
+
     static String ffchar(char p1) {
         return "ffchar: p1 = " + p1;
     }
-        
+
     static String ffdouble(double p1) {
         return "ffdouble: p1 = " + p1;
     }
-        
+
     static String fffloat(float p1) {
         return "fffloat: p1 = " + p1;
     }
-        
+
     static String ffint(int p1) {
         return "ffint: p1 = " + p1;
     }
-        
+
     static String fflong(long p1) {
         return "fflong: p1 = " + p1;
     }
-        
+
     static String ffshort(short p1) {
         return "ffshort: p1 = " + p1;
     }
-        
+
     static String ffintArray(int[] p1) {
         return "ffintArray: p1 = " + p1;
     }
@@ -139,15 +139,15 @@
     public static String ffoverload(jj1 arg) {
         return arg.me;
     }
-    
+
     static String ffoverload(boolean p1) {
         return "ffoverload: boolean p1 = " + p1;
     }
-/***        
+/***
     static String ffoverload(byte p1) {
         return "ffoverload: byte p1 = " + p1;
     }
-***/        
+***/
     static String ffoverload(char p1) {
         return "ffoverload: char p1 = " + p1;
     }
@@ -159,11 +159,11 @@
     static String ffoverload(float p1) {
         return "ffoverload: float p1 = " + p1;
     }
-/***        
+/***
     static String ffoverload(int p1) {
         return "ffoverload: int p1 = " + p1;
     }
-***/        
+***/
     static String ffoverload(long p1) {
         return "ffoverload: long p1 = " + p1;
     }
@@ -171,7 +171,7 @@
     static String ffoverload(short p1) {
         return "ffoverload: short p1 = " + p1;
     }
-      
+
     static String ffoverload(int[] p1) {
         return "ffoverload: int array p1 = " + p1;
     }
@@ -184,7 +184,7 @@
     public String toString() {
         return me;
     }
-    
+
   }
 
   static class jj2 extends jj1 {
@@ -227,7 +227,7 @@
     # Provide a visual break in the output
     cmd print 1
 
-    # Verify mixing primitive types works ok 
+    # Verify mixing primitive types works ok
     # These should work even though the arg types are
     # not the same because there is only one
     # method with each name.
@@ -302,7 +302,7 @@
 
     for ii in . $TESTSRC $TESTSRC/.. ; do
         if [ -r "$ii/ShellScaffold.sh" ] ; then
-            . $ii/ShellScaffold.sh 
+            . $ii/ShellScaffold.sh
             break
         fi
     done
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/GetLocalVariables3Test.sh
--- a/jdk/test/com/sun/jdi/GetLocalVariables3Test.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/GetLocalVariables3Test.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2002, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,7 @@
 
     for ii in . $TESTSRC $TESTSRC/.. ; do
         if [ -r "$ii/ShellScaffold.sh" ] ; then
-            . $ii/ShellScaffold.sh 
+            . $ii/ShellScaffold.sh
             break
         fi
     done
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/GetLocalVariables4Test.sh
--- a/jdk/test/com/sun/jdi/GetLocalVariables4Test.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/GetLocalVariables4Test.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2002, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -69,7 +69,7 @@
 
     for ii in . $TESTSRC $TESTSRC/.. ; do
         if [ -r "$ii/ShellScaffold.sh" ] ; then
-            . $ii/ShellScaffold.sh 
+            . $ii/ShellScaffold.sh
             break
         fi
     done
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/JdbExprTest.sh
--- a/jdk/test/com/sun/jdi/JdbExprTest.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/JdbExprTest.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@
     public static void bkpt() {
        int i = 0;     //@1 breakpoint
     }
-    
+
     public static void main(String[] args) {
         bkpt();
     }
@@ -73,7 +73,7 @@
 
     cmd print java.lang.Long.MIN_VALUE
     jdbFailIfNotPresent " \= \-9223372036854775808" 3
-    
+
     cmd print 9223372036854775807L
     jdbFailIfNotPresent "9223372036854775807L = 9223372036854775807" 3
     cmd print 9223372036854775807
@@ -83,7 +83,7 @@
     jdbFailIfNotPresent "\-9223372036854775807L = \-9223372036854775807" 3
     cmd print -9223372036854775807
     jdbFailIfNotPresent "\-9223372036854775807 = \-9223372036854775807" 3
-    
+
     cmd print -1
     jdbFailIfNotPresent "\-1 = \-1" 3
     cmd print 1L
@@ -92,7 +92,7 @@
     jdbFailIfNotPresent "\-1L = \-1" 3
     cmd print 0x1
     jdbFailIfNotPresent "0x1 = 1" 3
-    
+
     cmd set $classname.aLong = 9223372036854775807L
     cmd print $classname.aLong
     jdbFailIfNotPresent "$classname.aLong = 9223372036854775807" 3
@@ -142,7 +142,7 @@
 
     for ii in . $TESTSRC $TESTSRC/.. ; do
         if [ -r "$ii/ShellScaffold.sh" ] ; then
-            . $ii/ShellScaffold.sh 
+            . $ii/ShellScaffold.sh
             break
         fi
     done
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/JdbLockTest.sh
--- a/jdk/test/com/sun/jdi/JdbLockTest.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/JdbLockTest.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2003, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -94,7 +94,7 @@
 
     for ii in . $TESTSRC $TESTSRC/.. ; do
         if [ -r "$ii/ShellScaffold.sh" ] ; then
-            . $ii/ShellScaffold.sh 
+            . $ii/ShellScaffold.sh
             break
         fi
     done
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/MixedSuspendTest.sh
--- a/jdk/test/com/sun/jdi/MixedSuspendTest.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/MixedSuspendTest.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2005, 2015 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/NullLocalVariable.sh
--- a/jdk/test/com/sun/jdi/NullLocalVariable.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/NullLocalVariable.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2002, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -40,10 +40,10 @@
     public static final void main(String args[]) {
         try {
             System.out.println("hi!");               // @1 breakpoint
-        } catch (Exception e) {         
+        } catch (Exception e) {
             e.printStackTrace();
         } finally {
-            System.out.println("done"); 
+            System.out.println("done");
         }
     }
 }
@@ -71,7 +71,7 @@
 
     for ii in . $TESTSRC $TESTSRC/.. ; do
         if [ -r "$ii/ShellScaffold.sh" ] ; then
-            . $ii/ShellScaffold.sh 
+            . $ii/ShellScaffold.sh
             break
         fi
     done
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/NullThreadGroupNameTest.java
--- a/jdk/test/com/sun/jdi/NullThreadGroupNameTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/NullThreadGroupNameTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/RedefineChangeClassOrder.sh
--- a/jdk/test/com/sun/jdi/RedefineChangeClassOrder.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/RedefineChangeClassOrder.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2006, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -135,7 +135,7 @@
 
     for ii in . $TESTSRC $TESTSRC/.. ; do
         if [ -r "$ii/ShellScaffold.sh" ] ; then
-            . $ii/ShellScaffold.sh 
+            . $ii/ShellScaffold.sh
             break
         fi
     done
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/RedefineException.sh
--- a/jdk/test/com/sun/jdi/RedefineException.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/RedefineException.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2002, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -75,7 +75,7 @@
       }
       System.out.println("a2: done");
     }
-  
+
     public void a3() throws Exception {
       int a3local = 3;
       String a3string = "a3";
@@ -105,7 +105,7 @@
 
     for ii in . $TESTSRC $TESTSRC/.. ; do
         if [ -r "$ii/ShellScaffold.sh" ] ; then
-            . $ii/ShellScaffold.sh 
+            . $ii/ShellScaffold.sh
             break
         fi
     done
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/RedefineImplementor.sh
--- a/jdk/test/com/sun/jdi/RedefineImplementor.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/RedefineImplementor.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2006, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -81,7 +81,7 @@
 
     for ii in . $TESTSRC $TESTSRC/.. ; do
         if [ -r "$ii/ShellScaffold.sh" ] ; then
-            . $ii/ShellScaffold.sh 
+            . $ii/ShellScaffold.sh
             break
         fi
     done
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/jdi/RedefineIntConstantToLong.sh
--- a/jdk/test/com/sun/jdi/RedefineIntConstantToLong.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/jdi/RedefineIntConstantToLong.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2006, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -50,13 +50,13 @@
     }
 
     public long m2(int j) {
-        System.out.println(System.getProperty("line.separator") + 
+        System.out.println(System.getProperty("line.separator") +
                            "**** public long m2(int j) with value: " + j);
         return j;
     }
 
     public long m2(long j) {
-        System.out.println(System.getProperty("line.separator") + 
+        System.out.println(System.getProperty("line.separator") +
                            "**** public long m2(long j) with value: " + j);
         return j;
     }
@@ -102,7 +102,7 @@
 
     for ii in . $TESTSRC $TESTSRC/.. ; do
         if [ -r "$ii/ShellScaffold.sh" ] ; then
-            . $ii/ShellScaffold.sh 
+            . $ii/ShellScaffold.sh
             break
         fi
     done
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/management/GarbageCollectorMXBean/LastGCInfo.java
--- a/jdk/test/com/sun/management/GarbageCollectorMXBean/LastGCInfo.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/management/GarbageCollectorMXBean/LastGCInfo.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/net/httpserver/SimpleHttpServerTest.java
--- a/jdk/test/com/sun/net/httpserver/SimpleHttpServerTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/net/httpserver/SimpleHttpServerTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/net/httpserver/StopNoStartTest.java
--- a/jdk/test/com/sun/net/httpserver/StopNoStartTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/net/httpserver/StopNoStartTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/net/httpserver/bugs/B6433018.java
--- a/jdk/test/com/sun/net/httpserver/bugs/B6433018.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/net/httpserver/bugs/B6433018.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -103,4 +103,3 @@
         }
     }
 }
-
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/tools/attach/PermissionTest.java
--- a/jdk/test/com/sun/tools/attach/PermissionTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/tools/attach/PermissionTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/tools/attach/ProviderTest.java
--- a/jdk/test/com/sun/tools/attach/ProviderTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/tools/attach/ProviderTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/tools/attach/StartManagementAgent.java
--- a/jdk/test/com/sun/tools/attach/StartManagementAgent.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/tools/attach/StartManagementAgent.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/com/sun/tools/attach/TempDirTest.java
--- a/jdk/test/com/sun/tools/attach/TempDirTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/com/sun/tools/attach/TempDirTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java
--- a/jdk/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.html
--- a/jdk/test/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.html	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.html	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java
--- a/jdk/test/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/Dialog/NestedDialogs/Modal/NestedModalDialogTest.java
--- a/jdk/test/java/awt/Dialog/NestedDialogs/Modal/NestedModalDialogTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/Dialog/NestedDialogs/Modal/NestedModalDialogTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/Dialog/NestedDialogs/Modeless/NestedModelessDialogTest.java
--- a/jdk/test/java/awt/Dialog/NestedDialogs/Modeless/NestedModelessDialogTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/Dialog/NestedDialogs/Modeless/NestedModelessDialogTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/EventQueue/MainAppContext/MainAppContext.java
--- a/jdk/test/java/awt/EventQueue/MainAppContext/MainAppContext.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/EventQueue/MainAppContext/MainAppContext.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011,2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/FileDialog/RegexpFilterTest/RegexpFilterTest.html
--- a/jdk/test/java/awt/FileDialog/RegexpFilterTest/RegexpFilterTest.html	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/FileDialog/RegexpFilterTest/RegexpFilterTest.html	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
 -->
 
 <html>
-<!--  
+<!--
   @test
   @bug 4934185
   @summary JCK1.5-runtime-interactive: XToolkit FileDialog does not work as expected
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/Focus/WindowIsFocusableAccessByThreadsTest/WindowIsFocusableAccessByThreadsTest.java
--- a/jdk/test/java/awt/Focus/WindowIsFocusableAccessByThreadsTest/WindowIsFocusableAccessByThreadsTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/Focus/WindowIsFocusableAccessByThreadsTest/WindowIsFocusableAccessByThreadsTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/Frame/FrameResize/ShowChildWhileResizingTest.java
--- a/jdk/test/java/awt/Frame/FrameResize/ShowChildWhileResizingTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/Frame/FrameResize/ShowChildWhileResizingTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,6 +1,5 @@
-
 /*
- * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/FullScreen/AltTabCrashTest/AltTabCrashTest.java
--- a/jdk/test/java/awt/FullScreen/AltTabCrashTest/AltTabCrashTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/FullScreen/AltTabCrashTest/AltTabCrashTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java
--- a/jdk/test/java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/GlassPaneOverlappingTestBase.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java
--- a/jdk/test/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/Mixing/AWT_Mixing/SimpleOverlappingTestBase.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -165,4 +165,3 @@
     }
 
 }
-
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.java
--- a/jdk/test/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/MouseInfo/JContainerMousePositionTest.java
--- a/jdk/test/java/awt/MouseInfo/JContainerMousePositionTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/MouseInfo/JContainerMousePositionTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.sh
--- a/jdk/test/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/ksh -p
 
 #
-# Copyright (c) 20015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@
 
 #Call this from anywhere to fail the test with an error message
 # usage: fail "reason why the test failed"
-fail() 
+fail()
  { echo "The test failed :-("
    echo "$*" 1>&2
    echo "exit status was $status"
@@ -48,7 +48,7 @@
 
 #Call this from anywhere to pass the test with a message
 # usage: pass "reason why the test passed if applicable"
-pass() 
+pass()
  { echo "The test passed!!!"
    echo "$*" 1>&2
    exit 0
@@ -76,8 +76,8 @@
 esac
 
 
-# Want this test to run standalone as well as in the harness, so do the 
-#  following to copy the test's directory into the harness's scratch directory 
+# Want this test to run standalone as well as in the harness, so do the
+#  following to copy the test's directory into the harness's scratch directory
 #  and set all appropriate variables:
 
 if [ -z "${TESTJAVA}" ] ; then
@@ -100,25 +100,25 @@
 echo "JDK under test is: $TESTJAVA"
 
 #Deal with .class files:
-if [ -n "${STANDALONE}" ] ; 
-   then 
+if [ -n "${STANDALONE}" ] ;
+   then
    #if standalone, remind user to cd to dir. containing test before running it
    echo "Just a reminder: cd to the dir containing this test when running it"
    # then compile all .java files (if there are any) into .class files
-   if [ -a *.java ] ; 
+   if [ -a *.java ] ;
       then echo "Reminder, this test should be in its own directory with all"
       echo "supporting files it needs in the directory with it."
-      ${TESTJAVA}/bin/javac ./*.java ; 
+      ${TESTJAVA}/bin/javac ./*.java ;
    fi
    # else in harness so copy all the class files from where jtreg put them
-   # over to the scratch directory this test is running in. 
+   # over to the scratch directory this test is running in.
    else cp ${TESTCLASSES}/*.class . ;
 fi
 
-#if in test harness, then copy the entire directory that the test is in over 
+#if in test harness, then copy the entire directory that the test is in over
 # to the scratch directory.  This catches any support files needed by the test.
-if [ -z "${STANDALONE}" ] ; 
-   then cp ${TESTSRC}/* . 
+if [ -z "${STANDALONE}" ] ;
+   then cp ${TESTSRC}/* .
 fi
 
 #Just before executing anything, make sure it has executable permission!
@@ -156,4 +156,3 @@
 
 #For additional examples of how to write platform independent KSH scripts,
 # see the jtreg file itself.  It is a KSH script for both Solaris and Win32
-
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/Toolkit/ToolkitPropertyTest/bug7129133.java
--- a/jdk/test/java/awt/Toolkit/ToolkitPropertyTest/bug7129133.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/Toolkit/ToolkitPropertyTest/bug7129133.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/Window/FindOwner/FindOwnerTest.java
--- a/jdk/test/java/awt/Window/FindOwner/FindOwnerTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/Window/FindOwner/FindOwnerTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -107,4 +107,4 @@
             stop();
         }
     }
-}
\ No newline at end of file
+}
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java
--- a/jdk/test/java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/event/MouseEvent/DisabledComponents/DisabledComponentsTest.java
--- a/jdk/test/java/awt/event/MouseEvent/DisabledComponents/DisabledComponentsTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/event/MouseEvent/DisabledComponents/DisabledComponentsTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/font/TextLayout/ArabicDiacriticTest.java
--- a/jdk/test/java/awt/font/TextLayout/ArabicDiacriticTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/font/TextLayout/ArabicDiacriticTest.java	Tue May 09 12:57:30 2017 +0200
@@ -18,6 +18,7 @@
  *
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 /* @test
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/awt/font/TextLayout/MissingCodePointLayoutTest.java
--- a/jdk/test/java/awt/font/TextLayout/MissingCodePointLayoutTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/awt/font/TextLayout/MissingCodePointLayoutTest.java	Tue May 09 12:57:30 2017 +0200
@@ -18,6 +18,7 @@
  *
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 /* @test
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/io/RandomAccessFile/FileLengthTest.java
--- a/jdk/test/java/io/RandomAccessFile/FileLengthTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/io/RandomAccessFile/FileLengthTest.java	Tue May 09 12:57:30 2017 +0200
@@ -9,7 +9,7 @@
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE randomAccessFile that
+ * version 2 for more details (a copy is included in the LICENSE file that
  * accompanied this code).
  *
  * You should have received a copy of the GNU General Public License version
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/lang/instrument/RedefineBigClass.sh
--- a/jdk/test/java/lang/instrument/RedefineBigClass.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/lang/instrument/RedefineBigClass.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@
     -Xlog:redefine+class+load=debug,redefine+class+load+exceptions=info ${NMT} \
     -javaagent:RedefineBigClassAgent.jar=BigClass.class \
     -classpath "${TESTCLASSES}" RedefineBigClassApp \
-    > output.log 2>&1 
+    > output.log 2>&1
 result=$?
 
 cat output.log
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodType.java.template
--- a/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodType.java.template	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/lang/invoke/VarHandles/X-VarHandleTestMethodType.java.template	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3288,4 +3288,3 @@
 #end[Bitwise]
     }
 }
-
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/net/httpclient/ProxyAuthTest.java
--- a/jdk/test/java/net/httpclient/ProxyAuthTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/net/httpclient/ProxyAuthTest.java	Tue May 09 12:57:30 2017 +0200
@@ -20,6 +20,7 @@
  *
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 /*
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/nio/file/WatchService/DeleteInterference.java
--- a/jdk/test/java/nio/file/WatchService/DeleteInterference.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/nio/file/WatchService/DeleteInterference.java	Tue May 09 12:57:30 2017 +0200
@@ -15,6 +15,10 @@
  * You should have received a copy of the GNU General Public License version
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 /**
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/nio/file/attribute/BasicFileAttributeView/UnixSocketFile.java
--- a/jdk/test/java/nio/file/attribute/BasicFileAttributeView/UnixSocketFile.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/nio/file/attribute/BasicFileAttributeView/UnixSocketFile.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/security/AccessController/LimitedDoPrivilegedWithNullPerms.java
--- a/jdk/test/java/security/AccessController/LimitedDoPrivilegedWithNullPerms.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/security/AccessController/LimitedDoPrivilegedWithNullPerms.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013,2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/security/AccessController/LimitedDoPrivilegedWithThread.java
--- a/jdk/test/java/security/AccessController/LimitedDoPrivilegedWithThread.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/security/AccessController/LimitedDoPrivilegedWithThread.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013,2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/time/test/java/time/temporal/TestIsoWeekFields.java
--- a/jdk/test/java/time/test/java/time/temporal/TestIsoWeekFields.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/time/test/java/time/temporal/TestIsoWeekFields.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014,2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/PropertyBundle.properties
--- a/jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/PropertyBundle.properties	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/util/ResourceBundle/getBaseBundleName/resources/PropertyBundle.properties	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 20013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -21,4 +21,3 @@
 # questions.
 #
 dummy=foo
-
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/util/Spliterator/SpliteratorLateBindingFailFastHelper.java
--- a/jdk/test/java/util/Spliterator/SpliteratorLateBindingFailFastHelper.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/util/Spliterator/SpliteratorLateBindingFailFastHelper.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/util/logging/Logger/logrb/resources/PropertyBundle.properties
--- a/jdk/test/java/util/logging/Logger/logrb/resources/PropertyBundle.properties	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/util/logging/Logger/logrb/resources/PropertyBundle.properties	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 20013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -21,4 +21,3 @@
 # questions.
 #
 dummy=foo
-
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/java/util/logging/Logger/setResourceBundle/resources/PropertyBundle.properties
--- a/jdk/test/java/util/logging/Logger/setResourceBundle/resources/PropertyBundle.properties	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/java/util/logging/Logger/setResourceBundle/resources/PropertyBundle.properties	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 20013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -21,4 +21,3 @@
 # questions.
 #
 dummy=foo
-
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java
--- a/jdk/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/management/monitor/ThreadPoolAccTest.java
--- a/jdk/test/javax/management/monitor/ThreadPoolAccTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/management/monitor/ThreadPoolAccTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/net/ssl/TLS/CipherTestUtils.java
--- a/jdk/test/javax/net/ssl/TLS/CipherTestUtils.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/net/ssl/TLS/CipherTestUtils.java	Tue May 09 12:57:30 2017 +0200
@@ -2,21 +2,22 @@
  * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * This code is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 2 only, as published by
- * the Free Software Foundation.
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
  *
- * This code is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License version 2 for more
- * details (a copy is included in the LICENSE file that accompanied this code).
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
  *
- * You should have received a copy of the GNU General Public License version 2
- * along with this work; if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA or
- * visit www.oracle.com if you need additional information or have any
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/net/ssl/TLS/JSSEClient.java
--- a/jdk/test/javax/net/ssl/TLS/JSSEClient.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/net/ssl/TLS/JSSEClient.java	Tue May 09 12:57:30 2017 +0200
@@ -2,21 +2,22 @@
  * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * This code is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 2 only, as published by
- * the Free Software Foundation.
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
  *
- * This code is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License version 2 for more
- * details (a copy is included in the LICENSE file that accompanied this code).
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
  *
- * You should have received a copy of the GNU General Public License version 2
- * along with this work; if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA or
- * visit www.oracle.com if you need additional information or have any
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/net/ssl/TLS/JSSEServer.java
--- a/jdk/test/javax/net/ssl/TLS/JSSEServer.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/net/ssl/TLS/JSSEServer.java	Tue May 09 12:57:30 2017 +0200
@@ -2,21 +2,22 @@
  * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * This code is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 2 only, as published by
- * the Free Software Foundation.
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
  *
- * This code is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License version 2 for more
- * details (a copy is included in the LICENSE file that accompanied this code).
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
  *
- * You should have received a copy of the GNU General Public License version 2
- * along with this work; if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA or
- * visit www.oracle.com if you need additional information or have any
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/net/ssl/TLS/TestJSSE.java
--- a/jdk/test/javax/net/ssl/TLS/TestJSSE.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/net/ssl/TLS/TestJSSE.java	Tue May 09 12:57:30 2017 +0200
@@ -2,21 +2,22 @@
  * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * This code is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 2 only, as published by
- * the Free Software Foundation.
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
  *
- * This code is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License version 2 for more
- * details (a copy is included in the LICENSE file that accompanied this code).
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
  *
- * You should have received a copy of the GNU General Public License version 2
- * along with this work; if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA or
- * visit www.oracle.com if you need additional information or have any
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/net/ssl/TLS/TestJSSEClientDefaultProtocol.java
--- a/jdk/test/javax/net/ssl/TLS/TestJSSEClientDefaultProtocol.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/net/ssl/TLS/TestJSSEClientDefaultProtocol.java	Tue May 09 12:57:30 2017 +0200
@@ -2,21 +2,22 @@
  * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * This code is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 2 only, as published by
- * the Free Software Foundation.
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
  *
- * This code is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License version 2 for more
- * details (a copy is included in the LICENSE file that accompanied this code).
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
  *
- * You should have received a copy of the GNU General Public License version 2
- * along with this work; if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA or
- * visit www.oracle.com if you need additional information or have any
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/net/ssl/TLS/TestJSSEClientProtocol.java
--- a/jdk/test/javax/net/ssl/TLS/TestJSSEClientProtocol.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/net/ssl/TLS/TestJSSEClientProtocol.java	Tue May 09 12:57:30 2017 +0200
@@ -2,21 +2,22 @@
  * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * This code is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 2 only, as published by
- * the Free Software Foundation.
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
  *
- * This code is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License version 2 for more
- * details (a copy is included in the LICENSE file that accompanied this code).
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
  *
- * You should have received a copy of the GNU General Public License version 2
- * along with this work; if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA or
- * visit www.oracle.com if you need additional information or have any
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/net/ssl/TLS/TestJSSENoCommonProtocols.java
--- a/jdk/test/javax/net/ssl/TLS/TestJSSENoCommonProtocols.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/net/ssl/TLS/TestJSSENoCommonProtocols.java	Tue May 09 12:57:30 2017 +0200
@@ -2,21 +2,22 @@
  * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * This code is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 2 only, as published by
- * the Free Software Foundation.
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
  *
- * This code is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License version 2 for more
- * details (a copy is included in the LICENSE file that accompanied this code).
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
  *
- * You should have received a copy of the GNU General Public License version 2
- * along with this work; if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA or
- * visit www.oracle.com if you need additional information or have any
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/net/ssl/TLS/TestJSSEServerProtocol.java
--- a/jdk/test/javax/net/ssl/TLS/TestJSSEServerProtocol.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/net/ssl/TLS/TestJSSEServerProtocol.java	Tue May 09 12:57:30 2017 +0200
@@ -2,21 +2,22 @@
  * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * This code is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 2 only, as published by
- * the Free Software Foundation.
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
  *
- * This code is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License version 2 for more
- * details (a copy is included in the LICENSE file that accompanied this code).
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
  *
- * You should have received a copy of the GNU General Public License version 2
- * along with this work; if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA or
- * visit www.oracle.com if you need additional information or have any
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/print/attribute/TestUnsupportedResolution.java
--- a/jdk/test/javax/print/attribute/TestUnsupportedResolution.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/print/attribute/TestUnsupportedResolution.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -104,4 +104,3 @@
     return PAGE_EXISTS;
 }
 }
-
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/security/auth/Subject/Generic.java
--- a/jdk/test/javax/security/auth/Subject/Generic.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/security/auth/Subject/Generic.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/JAASConfigSyntaxTest.java
--- a/jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/JAASConfigSyntaxTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/JAASConfigSyntaxTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,23 +1,23 @@
-
-/**
+/*
  * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * This code is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 2 only, as published by
- * the Free Software Foundation.
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
  *
- * This code is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License version 2 for more
- * details (a copy is included in the LICENSE file that accompanied this code).
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
  *
- * You should have received a copy of the GNU General Public License version 2
- * along with this work; if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA or
- * visit www.oracle.com if you need additional information or have any
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/SampleLoginModule.java
--- a/jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/SampleLoginModule.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/security/auth/login/JAASConfigSyntaxCheck/SampleLoginModule.java	Tue May 09 12:57:30 2017 +0200
@@ -1,22 +1,23 @@
-/**
+/*
  * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * This code is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 2 only, as published by
- * the Free Software Foundation.
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
  *
- * This code is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License version 2 for more
- * details (a copy is included in the LICENSE file that accompanied this code).
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
  *
- * You should have received a copy of the GNU General Public License version 2
- * along with this work; if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA or
- * visit www.oracle.com if you need additional information or have any
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/swing/JComboBox/6632953/bug6632953.java
--- a/jdk/test/javax/swing/JComboBox/6632953/bug6632953.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/swing/JComboBox/6632953/bug6632953.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/swing/JFileChooser/4150029/bug4150029.html
--- a/jdk/test/javax/swing/JFileChooser/4150029/bug4150029.html	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/swing/JFileChooser/4150029/bug4150029.html	Tue May 09 12:57:30 2017 +0200
@@ -1,6 +1,6 @@
 <html>
 <!--
- Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
@@ -40,4 +40,4 @@
 3.Push OPEN button.
 4.Push DONE button.
 </body>
-</html> 
+</html>
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/swing/JInternalFrame/Test6325652.java
--- a/jdk/test/javax/swing/JInternalFrame/Test6325652.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/swing/JInternalFrame/Test6325652.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009,2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/swing/JMenu/8072900/WrongSelectionOnMouseOver.java
--- a/jdk/test/javax/swing/JMenu/8072900/WrongSelectionOnMouseOver.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/swing/JMenu/8072900/WrongSelectionOnMouseOver.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/swing/JPopupMenu/6694823/bug6694823.java
--- a/jdk/test/javax/swing/JPopupMenu/6694823/bug6694823.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/swing/JPopupMenu/6694823/bug6694823.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java
--- a/jdk/test/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/javax/swing/text/html/parser/Parser/8028616/bug8028616.java
--- a/jdk/test/javax/swing/text/html/parser/Parser/8028616/bug8028616.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/javax/swing/text/html/parser/Parser/8028616/bug8028616.java	Tue May 09 12:57:30 2017 +0200
@@ -8,7 +8,7 @@
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * version 2 for more details (a copy is included in the LICENSE file that
  * accompanied this code).
  *
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/sun/awt/dnd/8024061/bug8024061.java
--- a/jdk/test/sun/awt/dnd/8024061/bug8024061.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/sun/awt/dnd/8024061/bug8024061.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/sun/net/idn/NFS4StringPrep.java
--- a/jdk/test/sun/net/idn/NFS4StringPrep.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/sun/net/idn/NFS4StringPrep.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/sun/security/krb5/auto/BogusKDC.java
--- a/jdk/test/sun/security/krb5/auto/BogusKDC.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/sun/security/krb5/auto/BogusKDC.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/sun/security/krb5/auto/NoAddresses.java
--- a/jdk/test/sun/security/krb5/auto/NoAddresses.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/sun/security/krb5/auto/NoAddresses.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/sun/security/krb5/auto/Renew.java
--- a/jdk/test/sun/security/krb5/auto/Renew.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/sun/security/krb5/auto/Renew.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/sun/security/krb5/auto/Renewal.java
--- a/jdk/test/sun/security/krb5/auto/Renewal.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/sun/security/krb5/auto/Renewal.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/sun/security/krb5/auto/SSLwithPerms.java
--- a/jdk/test/sun/security/krb5/auto/SSLwithPerms.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/sun/security/krb5/auto/SSLwithPerms.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/sun/security/krb5/canonicalize/Test.java
--- a/jdk/test/sun/security/krb5/canonicalize/Test.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/sun/security/krb5/canonicalize/Test.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/sun/security/mscapi/CastError.java
--- a/jdk/test/sun/security/mscapi/CastError.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/sun/security/mscapi/CastError.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/sun/security/mscapi/PrngSlow.java
--- a/jdk/test/sun/security/mscapi/PrngSlow.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/sun/security/mscapi/PrngSlow.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/sun/security/mscapi/PublicKeyInterop.sh
--- a/jdk/test/sun/security/mscapi/PublicKeyInterop.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/sun/security/mscapi/PublicKeyInterop.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/sun/security/pkcs12/StoreSecretKeyTest.java
--- a/jdk/test/sun/security/pkcs12/StoreSecretKeyTest.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/sun/security/pkcs12/StoreSecretKeyTest.java	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java
--- a/jdk/test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java	Tue May 09 12:57:30 2017 +0200
@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, 2016, Oracle and/or its affiliates. All rights
- * reserved.
+ * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/sun/security/tools/jarsigner/nameclash.sh
--- a/jdk/test/sun/security/tools/jarsigner/nameclash.sh	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/sun/security/tools/jarsigner/nameclash.sh	Tue May 09 12:57:30 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, 2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -63,4 +63,3 @@
 $JARSIGNER -verify -debug -strict $JFILE || exit 3
 
 exit 0
-
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/sun/security/x509/URICertStore/SocksProxy.java
--- a/jdk/test/sun/security/x509/URICertStore/SocksProxy.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/sun/security/x509/URICertStore/SocksProxy.java	Tue May 09 12:57:30 2017 +0200
@@ -8,7 +8,7 @@
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * version 2 for more details (a copy is included in the LICENSE file that
  * accompanied this code).
  *
diff -r 0cf367e546fb -r b0ea3c0bfb81 jdk/test/tools/pack200/MultiRelease.java
--- a/jdk/test/tools/pack200/MultiRelease.java	Mon May 08 21:21:39 2017 -0700
+++ b/jdk/test/tools/pack200/MultiRelease.java	Tue May 09 12:57:30 2017 +0200
@@ -12,7 +12,7 @@
  * version 2 for more details (a copy is included in the LICENSE file that
  * accompanied this code).
  *
- r You should have received a copy of the GNU General Public License version
+ * You should have received a copy of the GNU General Public License version
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *