hg: amber/amber/langtools: Automatic merge with constant-folding

[maurizio.cimadamore at oracle.com]

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

Automatic merge with constant-folding

- 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