hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 9087ba61a5bd
Author:    mcimadamore
Date:      2019-02-22 14:53 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/9087ba61a5bd

Automatic merge with default

! src/hotspot/share/classfile/classFileParser.cpp
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlConstants.java