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

[maurizio.cimadamore at oracle.com]

Changeset: 88758cae85e7
Author:    langtools
Date:      2017-05-12 01:29 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/88758cae85e7

Automatic merge with condy