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

[maurizio.cimadamore at oracle.com]

Changeset: eba20abf4c15
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-09 00:04 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/eba20abf4c15

Automatic merge with condy