hg: jdk9/sandbox/langtools: Merge

[michael.x.mcmahon at oracle.com]

Changeset: 57fa06c33196
Author:    michaelm
Date:      2016-08-22 13:08 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/langtools/rev/57fa06c33196

Merge

- make/intellij/runConfigurations/jtreg__debug_.xml
- make/intellij/runConfigurations/jtreg__run_.xml
- make/intellij/utils/jtreg-live-templates.xml
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/MessageRetriever.java
- test/jdk/javadoc/tool/generics/genericClass/Main.java
- test/jdk/javadoc/tool/generics/genericClass/expected.out
- test/jdk/javadoc/tool/generics/genericClass/pkg1/A.java
- test/jdk/javadoc/tool/generics/genericInnerAndOuter/Main.java
- test/jdk/javadoc/tool/generics/genericInnerAndOuter/expected.out
- test/jdk/javadoc/tool/generics/genericInnerAndOuter/pkg1/O.java
- test/jdk/javadoc/tool/generics/genericInnerAndOuter/pkg1/X.java
- test/jdk/javadoc/tool/generics/genericInterface/Main.java
- test/jdk/javadoc/tool/generics/genericInterface/expected.out
- test/jdk/javadoc/tool/generics/genericInterface/pkg1/A.java
- test/jdk/javadoc/tool/generics/genericMethod/Main.java
- test/jdk/javadoc/tool/generics/genericMethod/expected.out
- test/jdk/javadoc/tool/generics/genericMethod/pkg1/A.java
- test/jdk/javadoc/tool/generics/genericSuper/Main.java
- test/jdk/javadoc/tool/generics/genericSuper/expected.out
- test/jdk/javadoc/tool/generics/genericSuper/pkg1/A.java
- test/jdk/javadoc/tool/generics/supertypes/Main.java
- test/jdk/javadoc/tool/generics/supertypes/expected.out
- test/jdk/javadoc/tool/generics/supertypes/pkg1/A.java
- test/jdk/javadoc/tool/generics/supertypes/pkg1/B.java
- test/jdk/javadoc/tool/generics/throwsGeneric/Main.java
- test/jdk/javadoc/tool/generics/throwsGeneric/expected.out
- test/jdk/javadoc/tool/generics/throwsGeneric/pkg1/A.java
- test/jdk/javadoc/tool/generics/tparamCycle/Main.java
- test/jdk/javadoc/tool/generics/tparamCycle/pkg1/LikeEnum.java
- test/jdk/javadoc/tool/generics/tparamTagOnMethod/Main.java
- test/jdk/javadoc/tool/generics/tparamTagOnMethod/expected.out
- test/jdk/javadoc/tool/generics/tparamTagOnMethod/pkg1/A.java
- test/jdk/javadoc/tool/generics/tparamTagOnType/Main.java
- test/jdk/javadoc/tool/generics/tparamTagOnType/expected.out
- test/jdk/javadoc/tool/generics/tparamTagOnType/pkg1/A.java
- test/jdk/javadoc/tool/generics/wildcards/Main.java
- test/jdk/javadoc/tool/generics/wildcards/expected.out
- test/jdk/javadoc/tool/generics/wildcards/pkg1/A.java
- test/jdk/javadoc/tool/imports/I.java
- test/jdk/javadoc/tool/imports/MissingImport.java
- test/jdk/javadoc/tool/lib/Tester.java
- test/jdk/javadoc/tool/sourceOnly/p/NonSource.class
- test/tools/javac/MethodParameters/Tester.java
- test/tools/javac/defaultMethods/static/StaticInvoke.java
- test/tools/javac/defaultMethods/static/StaticInvoke6.out
- test/tools/javac/defaultMethods/static/StaticInvoke7.out
- test/tools/javac/diags/examples/InvalidArgForXPatch/InvalidArgForXpatch.java
- test/tools/javac/generics/diamond/neg/Neg09.java
- test/tools/javac/generics/diamond/neg/Neg09.out
- test/tools/javac/options/modes/Tester.java
- test/tools/javadoc/lib/Tester.java
- test/tools/javap/output/Tester.java