hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 40fcb85888b8
Author:    mcimadamore
Date:      2017-10-26 22:04 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/40fcb85888b8

Automatic merge with default

- src/java.base/share/classes/com/sun/crypto/provider/PBECipherCore.java
- src/java.base/share/classes/jdk/internal/misc/ObjectStreamClassValidator.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java