hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: a95271ee9ed5
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-17 01:06 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/a95271ee9ed5

Automatic merge with default