hg: amber/amber: manual merge with jep branch

[vicente.romero at oracle.com]

Changeset: 0c64fc0636bf
Author:    vromero
Date:      2018-05-25 06:40 -0700
URL:       http://hg.openjdk.java.net/amber/amber/rev/0c64fc0636bf

manual merge with jep branch

! src/java.base/share/classes/java/lang/Enum.java
! src/java.base/share/classes/java/lang/invoke/VarHandle.java
! src/java.base/share/classes/java/lang/invoke/X-VarHandle.java.template
! src/java.base/share/classes/java/lang/invoke/constant/ConstantDesc.java
! src/java.base/share/classes/java/lang/invoke/constant/ConstantDescs.java
! src/java.base/share/classes/java/lang/invoke/constant/ConstantUtils.java
! src/java.base/share/classes/java/lang/invoke/constant/DynamicConstantDesc.java
- src/java.base/share/classes/java/lang/invoke/constant/EnumDesc.java
- src/java.base/share/classes/java/lang/invoke/constant/VarHandleDesc.java
! src/java.base/share/classes/java/lang/invoke/constant/package-info.java
! test/jdk/java/lang/invoke/constant/ClassRefTest.java
! test/jdk/java/lang/invoke/constant/CondyRefTest.java