hg: jdk9/sandbox/langtools: Merge

[stuart.marks at oracle.com]

Changeset: 0288f9d80b33
Author:    smarks
Date:      2015-12-08 13:48 -0800
URL:       http://hg.openjdk.java.net/jdk9/sandbox/langtools/rev/0288f9d80b33

Merge

- src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileObject.java
- src/jdk.compiler/share/classes/com/sun/tools/javac/file/RegularFileObject.java
- src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipArchive.java
- src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipFileIndex.java
- src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java
- src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipFileIndexCache.java
- test/tools/javac/T6413876.java
- test/tools/javac/T6705935.java
- test/tools/javac/diags/examples/DiamondRedundantArgs1.java
- test/tools/javac/generics/diamond/7002837/T7002837.out
- test/tools/javac/generics/diamond/neg/T8078473.out
- test/tools/javac/generics/diamond/neg/T8078473_2.out