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

[maurizio.cimadamore at oracle.com]

Changeset: c0c10bb83403
Author:    langtools
Date:      2017-04-27 08:21 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/c0c10bb83403

Automatic merge with default