hg: jdk9/sandbox/langtools: Merge

[aleksey.shipilev at oracle.com]

Changeset: c26d47fb1df1
Author:    shade
Date:      2016-03-10 01:40 +0300
URL:       http://hg.openjdk.java.net/jdk9/sandbox/langtools/rev/c26d47fb1df1

Merge

! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
- src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/LinePrefixFilterWriter.java
- src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/SimpleDocFileFactory.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/SimpleDocFileFactory.java
- test/tools/javac/6521805/T6521805a.java
- test/tools/javac/6521805/T6521805a_1.out
- test/tools/javac/6521805/T6521805a_2.out
- test/tools/javac/T6873845.java
- test/tools/javac/TestIndyStringConcat.java
- test/tools/javac/diags/examples/WarnSyntheticNameConflict.java
- test/tools/javac/warnings/6594914/T6594914b.java