hg: jigsaw/m2/langtools: Fix after merge

[jonathan . gibbons]

Changeset: cf2ca07f745a
Author:    jjg
Date:      2014-11-07 14:29 -0800
URL:       http://hg.openjdk.java.net/jigsaw/m2/langtools/rev/cf2ca07f745a

Fix after merge

! src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java
! test/tools/javap/T6729471.java
! test/tools/sjavac/DependencyCollection.java