--- a/jdk/src/java.base/macosx/classes/java/lang/ClassLoaderHelper.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/macosx/classes/java/lang/ClassLoaderHelper.java	Wed Jul 20 08:32:07 2016 -0700
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.lang;
 
 import java.io.File;

--- a/jdk/src/java.base/share/classes/com/sun/security/ntlm/Server.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/classes/com/sun/security/ntlm/Server.java	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/classes/java/security/Provider.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/security/Provider.java	Wed Jul 20 08:32:07 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved
+ * Copyright (c) 1996, 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

--- a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageHeader.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageHeader.java	Wed Jul 20 08:32:07 2016 -0700
@@ -21,7 +21,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.internal.jimage;
 

--- a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageStream.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageStream.java	Wed Jul 20 08:32:07 2016 -0700
@@ -3,18 +3,18 @@
  * 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 License version 2 only, as
+ * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
  * by Oracle 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 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).
  *
- * You should have received a copy of the GNU General 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.
  *

--- a/jdk/src/java.base/share/classes/jdk/internal/ref/WeakCleanable.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/classes/jdk/internal/ref/WeakCleanable.java	Wed Jul 20 08:32:07 2016 -0700
@@ -1,5 +1,3 @@
-package jdk.internal.ref;
-
 /*
  * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,6 +23,8 @@
  * questions.
  */
 
+package jdk.internal.ref;
+
 import java.lang.ref.Cleaner;
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;

--- a/jdk/src/java.base/share/classes/sun/security/util/AbstractAlgorithmConstraints.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/util/AbstractAlgorithmConstraints.java	Wed Jul 20 08:32:07 2016 -0700
@@ -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

--- a/jdk/src/java.base/share/native/libfdlibm/e_acos.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/e_acos.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/e_asin.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/e_asin.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/e_atan2.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/e_atan2.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/e_atanh.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/e_atanh.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/e_cosh.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/e_cosh.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/e_exp.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/e_exp.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/e_fmod.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/e_fmod.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/e_log.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/e_log.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/e_log10.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/e_log10.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/e_rem_pio2.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/e_rem_pio2.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/e_remainder.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/e_remainder.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/e_scalb.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/e_scalb.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/e_sinh.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/e_sinh.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/fdlibm.h	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/fdlibm.h	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/k_cos.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/k_cos.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/k_rem_pio2.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/k_rem_pio2.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/k_sin.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/k_sin.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/k_standard.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/k_standard.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/k_tan.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/k_tan.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_atan.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_atan.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_ceil.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_ceil.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_copysign.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_copysign.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_cos.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_cos.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_expm1.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_expm1.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_fabs.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_fabs.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_finite.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_finite.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_floor.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_floor.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_frexp.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_frexp.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_ilogb.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_ilogb.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_isnan.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_isnan.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_ldexp.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_ldexp.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_lib_version.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_lib_version.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_log1p.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_log1p.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_logb.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_logb.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_matherr.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_matherr.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_modf.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_modf.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_nextafter.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_nextafter.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_rint.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_rint.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_scalbn.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_scalbn.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_significand.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_significand.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_sin.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_sin.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_tan.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_tan.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libfdlibm/s_tanh.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libfdlibm/s_tanh.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.base/share/native/libjimage/NativeImageBuffer.cpp	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libjimage/NativeImageBuffer.cpp	Wed Jul 20 08:32:07 2016 -0700
@@ -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

--- a/jdk/src/java.base/share/native/libjimage/endian.cpp	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libjimage/endian.cpp	Wed Jul 20 08:32:07 2016 -0700
@@ -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

--- a/jdk/src/java.base/share/native/libjimage/imageFile.cpp	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libjimage/imageFile.cpp	Wed Jul 20 08:32:07 2016 -0700
@@ -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

--- a/jdk/src/java.base/share/native/libjimage/jimage.cpp	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/share/native/libjimage/jimage.cpp	Wed Jul 20 08:32:07 2016 -0700
@@ -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

--- a/jdk/src/java.base/unix/classes/java/lang/ClassLoaderHelper.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/unix/classes/java/lang/ClassLoaderHelper.java	Wed Jul 20 08:32:07 2016 -0700
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.lang;
 
 import java.io.File;

--- a/jdk/src/java.base/unix/classes/java/net/DefaultDatagramSocketImplFactory.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/unix/classes/java/net/DefaultDatagramSocketImplFactory.java	Wed Jul 20 08:32:07 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007,2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2011, 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,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.net;
 
 import sun.security.action.GetPropertyAction;

--- a/jdk/src/java.base/windows/classes/java/lang/ClassLoaderHelper.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/windows/classes/java/lang/ClassLoaderHelper.java	Wed Jul 20 08:32:07 2016 -0700
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package java.lang;
 
 import java.io.File;

--- a/jdk/src/java.base/windows/native/libjava/jni_util_md.c	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.base/windows/native/libjava/jni_util_md.c	Wed Jul 20 08:32:07 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * 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

--- a/jdk/src/java.httpclient/share/classes/java/net/http/WSSharedPool.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.httpclient/share/classes/java/net/http/WSSharedPool.java	Wed Jul 20 08:32:07 2016 -0700
@@ -3,18 +3,18 @@
  * 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  License version 2 only, as
+ * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
  * by Oracle 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  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).
  *
- * You should have received a copy of the GNU General  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.
  *

--- a/jdk/src/java.management/share/classes/com/sun/jmx/remote/util/EnvHelp.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.management/share/classes/com/sun/jmx/remote/util/EnvHelp.java	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

--- a/jdk/src/java.management/share/classes/javax/management/ConstructorParameters.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/java.management/share/classes/javax/management/ConstructorParameters.java	Wed Jul 20 08:32:07 2016 -0700
@@ -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

--- a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/LibMDMech.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/LibMDMech.java	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *

--- a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoMech.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/UcryptoMech.java	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *

--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java	Wed Jul 20 08:32:07 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -23,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package jdk.tools.jlink.builder;
 
 import java.io.BufferedOutputStream;

--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/BasicImageWriter.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/BasicImageWriter.java	Wed Jul 20 08:32:07 2016 -0700
@@ -21,7 +21,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.tools.jlink.internal;
 

--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PerfectHashBuilder.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/PerfectHashBuilder.java	Wed Jul 20 08:32:07 2016 -0700
@@ -21,7 +21,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.tools.jlink.internal;
 

--- a/jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/Device.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/Device.java	Wed Jul 20 08:32:07 2016 -0700
@@ -1,5 +1,3 @@
-package checker;
-
 /*
  * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  *
@@ -31,6 +29,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+package checker;
+
 /*
  * This source code is provided to illustrate the usage of a given feature
  * or technique and has been deliberately simplified. Additional steps

--- a/jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/Module.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/Module.java	Wed Jul 20 08:32:07 2016 -0700
@@ -1,5 +1,3 @@
-package checker;
-
 /*
  * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  *
@@ -31,6 +29,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+package checker;
+
 /*
  * This source code is provided to illustrate the usage of a given feature
  * or technique and has been deliberately simplified. Additional steps

--- a/jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/RequireContainer.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/sample/share/annotations/DependencyChecker/PluginChecker/src/checker/RequireContainer.java	Wed Jul 20 08:32:07 2016 -0700
@@ -1,5 +1,3 @@
-package checker;
-
 /*
  * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  *
@@ -31,6 +29,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+package checker;
+
 /*
  * This source code is provided to illustrate the usage of a given feature
  * or technique and has been deliberately simplified. Additional steps

--- a/jdk/src/sample/share/nio/chatserver/ChatServer.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/sample/share/nio/chatserver/ChatServer.java	Wed Jul 20 08:32:07 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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

--- a/jdk/src/sample/share/nio/chatserver/Client.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/sample/share/nio/chatserver/Client.java	Wed Jul 20 08:32:07 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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

--- a/jdk/src/sample/share/nio/chatserver/ClientReader.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/sample/share/nio/chatserver/ClientReader.java	Wed Jul 20 08:32:07 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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

--- a/jdk/src/sample/share/nio/chatserver/DataReader.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/sample/share/nio/chatserver/DataReader.java	Wed Jul 20 08:32:07 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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

--- a/jdk/src/sample/share/nio/chatserver/MessageReader.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/sample/share/nio/chatserver/MessageReader.java	Wed Jul 20 08:32:07 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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

--- a/jdk/src/sample/share/nio/chatserver/NameReader.java	Tue Jul 19 10:05:22 2016 -0700
+++ b/jdk/src/sample/share/nio/chatserver/NameReader.java	Wed Jul 20 08:32:07 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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