hg: amber/amber/jdk: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: b2cffa5eada7
Author:    langtools
Date:      2017-05-11 01:46 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/b2cffa5eada7

Automatic merge with default

- src/java.base/share/classes/sun/security/ssl/EllipticCurvesExtension.java