hg: amber/amber: Automatic merge with patterns-stage-1

[maurizio.cimadamore at oracle.com]

Changeset: a1b8e9c3de61
Author:    mcimadamore
Date:      2019-06-20 22:06 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/a1b8e9c3de61

Automatic merge with patterns-stage-1