hg: amber/amber: manual merge

[maurizio.cimadamore at oracle.com]

Changeset: b90a1b5b8142
Author:    mcimadamore
Date:      2017-09-25 16:38 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/b90a1b5b8142

manual merge

! make/Bundles.gmk
! make/CopyImportModules.gmk
! make/CreateBuildJdkCopy.gmk
! make/CreateJmods.gmk
! make/Docs.gmk
! make/GenerateLinkOptData.gmk
! make/Images.gmk
! make/Init.gmk
! make/InitSupport.gmk
! make/Jprt.gmk
! make/MacBundles.gmk
! make/Main.gmk
! make/MainSupport.gmk
! make/ReleaseFile.gmk
! make/RunTests.gmk
! make/autoconf/Makefile.in
! make/autoconf/basics.m4
! make/autoconf/basics_windows.m4
! make/autoconf/boot-jdk.m4
! make/autoconf/bootcycle-spec.gmk.in
! make/autoconf/buildjdk-spec.gmk.in
! make/autoconf/compare.sh.in
! make/autoconf/flags.m4
! make/autoconf/generated-configure.sh
! make/autoconf/help.m4
! make/autoconf/jdk-options.m4
! make/autoconf/source-dirs.m4
! make/autoconf/spec.gmk.in
! make/autoconf/toolchain.m4
! make/common/JarArchive.gmk
! make/common/MakeBase.gmk
! make/common/NativeCompilation.gmk
! make/common/ZipArchive.gmk
! make/copy/Copy-java.base.gmk
! make/devkit/Makefile
! make/devkit/Tools.gmk
! make/gensrc/Gensrc-jdk.charsets.gmk
! make/gensrc/GensrcIcons.gmk
! make/hotspot/ide/CreateVSProject.gmk
! make/langtools/intellij/langtools.iml
! make/scripts/compare.sh
! make/test/JtregNativeHotspot.gmk
! make/test/JtregNativeJdk.gmk
! src/java.base/share/classes/java/lang/invoke/CallSite.java
! src/java.base/share/classes/java/lang/invoke/package-info.java
! src/java.base/share/native/libjli/java.c
- src/sample/nashorn/disassemble.js
! src/sample/nashorn/java_completion.js