hg: amber/amber: manual merge with jep branch

[vicente.romero at oracle.com]

Changeset: 6c94272f961d
Author:    vromero
Date:      2018-05-24 11:47 -0700
URL:       http://hg.openjdk.java.net/amber/amber/rev/6c94272f961d

manual merge with jep branch

! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java