hg: jdk9/sandbox/langtools: Merge

[erik.joelsson at oracle.com]

Changeset: 55f09c17b67f
Author:    erikj
Date:      2016-03-21 17:25 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/langtools/rev/55f09c17b67f

Merge

- 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/TestIndyStringConcat.java
- test/tools/javac/diags/examples/WarnSyntheticNameConflict.java