hg: amber/amber/langtools: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 6e9e2d46a6f6
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-09 00:02 +0200
URL:       http://hg.openjdk.java.net/amber/amber/langtools/rev/6e9e2d46a6f6

Automatic merge with default

- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConfigurationImpl.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Configuration.java