hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: cc8d0996a346
Author:    mcimadamore
Date:      2017-11-02 22:04 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/cc8d0996a346

Automatic merge with default

- test/langtools/tools/javac/diags/examples/PatchModuleWithRelease/PatchModuleWithRelease.java
- test/langtools/tools/javac/diags/examples/PatchModuleWithRelease/patchmodule/java.base/java/lang/Test.java