hg: amber/amber: Automatic merge with condy

[maurizio.cimadamore at oracle.com]

Changeset: 96d06dbff0fe
Author:    mcimadamore
Date:      2018-01-25 22:07 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/96d06dbff0fe

Automatic merge with condy

! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
- test/jdk/sun/security/krb5/auto/principalProperty/TestHosts