hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: a12c697cee55
Author:    mcimadamore
Date:      2018-04-12 22:06 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/a12c697cee55

Automatic merge with default

! make/mapfiles/libjsig/mapfile-vers-solaris
- src/java.base/linux/native/libjsig/jsig.c
- src/java.base/macosx/native/libjsig/jsig.c
- src/java.base/share/classes/java/time/format/ZoneName.java
- src/java.base/solaris/native/libjsig/jsig.c
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties