hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 06793e20e62a
Author:    mcimadamore
Date:      2017-09-26 15:24 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/06793e20e62a

Automatic merge with default

! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
! src/jdk.jshell/share/classes/jdk/jshell/ExpressionToTypeInfo.java
! test/langtools/jdk/jshell/CompletionSuggestionTest.java
! test/langtools/jdk/jshell/ToolSimpleTest.java
! test/langtools/jdk/jshell/VariablesTest.java
! test/langtools/tools/javac/lvti/FoldingTest.java
! test/langtools/tools/javac/lvti/SelfRefTest.java