hg: amber/amber/nashorn: Automatic merge with constant-folding

[maurizio.cimadamore at oracle.com]

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

Automatic merge with constant-folding