hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 844b03b34151
Author:    mcimadamore
Date:      2017-09-25 16:59 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/844b03b34151

Automatic merge with default

- src/sample/nashorn/disassemble.js