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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default

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