hg: amber/amber/jdk: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 6b2ebf118a56
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-07-14 00:01 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/6b2ebf118a56

Automatic merge with default

- test/java/lang/System/MacEncoding/MacJNUEncoding.sh