Merge

6956462: AssertionError exception thrown in the Compiler Tree API in JDK 7. Reviewed-by: jjg

6458823: Messager messages on TypeParamterElements to not include position information. Reviewed-by: jjg

6921495: spurious semicolons in class def cause empty NOPOS blocks Reviewed-by: mcimadamore

6458749: TypeParameterElement.getEnclosedElements throws NPE within javac. Reviewed-by: jjg

6979683: inconsistent interaction of reference cast with box/unbox conversions leaves out a useful case Summary: Allow casts which narrow and then unbox. Reviewed-by: mcimadamore

6403465: javac should defer diagnostics until it can be determined they are persistent Reviewed-by: mcimadamore, darcy

6980707: Reduce use of IOException in JavaCompiler Reviewed-by: darcy

6570730: com.sun.source.tree.ModifiersTree.getFlags() should return class type Reviewed-by: mcimadamore

6980724: test/tools/javac/InterfaceAssert.java sometimes fails Reviewed-by: darcy

6980017: javap -XDdetail:source behaves badly if source not available. Reviewed-by: ksrini

6604599: ToolProvider should be less compiler-specific Reviewed-by: darcy

6875847: Java Locale Enhancement Summary: Fix for javac to allow "sun.util.locale" package accessible. Reviewed-by: jjg

6960424: new option -Xpkginfo for better control of when package-info.class is generated Reviewed-by: mcimadamore

6979564: ":" for path separator in dist/bin/javac does not work on Windows Reviewed-by: jjh

6929404: Filer.getResource(SOURCE_PATH, ...) does not work when -sourcepath contains >1 entry Reviewed-by: darcy