hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default

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