hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: bd5711180ed7
Author:    mcimadamore
Date:      2018-02-08 22:05 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/bd5711180ed7

Automatic merge with default

- make/autoconf/autogen.sh
- make/autoconf/generated-configure.sh
- make/devkit/createMacosxDevkit.sh
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionCategory.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionDescriptor.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionDescriptors.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionKey.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionType.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/OptionValues.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.options/src/org/graalvm/options/package-info.java