hg: jdk9/sandbox/nashorn: Merge

[erik.joelsson at oracle.com]

Changeset: 04b6a762bbad
Author:    erikj
Date:      2016-11-14 14:44 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/nashorn/rev/04b6a762bbad

Merge

- src/jdk.dynalink/share/classes/jdk/dynalink/CompositeOperation.java