hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default

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