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

[maurizio.cimadamore at oracle.com]

Changeset: 3496b9e2e9a3
Author:    langtools
Date:      2017-05-05 20:59 +0200
URL:       http://hg.openjdk.java.net/amber/amber/nashorn/rev/3496b9e2e9a3

Automatic merge with condy