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

[maurizio.cimadamore at oracle.com]

Changeset: ab3d901ce026
Author:    langtools
Date:      2017-05-04 16:41 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/ab3d901ce026

Automatic merge with condy