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

[maurizio.cimadamore at oracle.com]

Changeset: 90d9d2ab6812
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-07-14 00:04 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/90d9d2ab6812

Automatic merge with condy