hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default

! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/verifier.cpp
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlConstants.java
! test/langtools/jdk/javadoc/lib/javadoc/tester/JavadocTester.java