7016897: Copyright header correction : test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java Reviewed-by: vinnie

7008595: Class loader leak caused by keepAliveTimer thread in KeepAliveCache Reviewed-by: michaelm

7012540: java.util.Objects.nonNull() incorrectly named Reviewed-by: darcy, weijun

7015391: (zipfs) Update zip provider for 1/2011 changes 7014948: (zipfs) ZipFileSystem.newFileSystem(Path...) should not throw FileSystemAlreadyExistsException 7015139: (zipfs) ZipPath.delete() should throw DirectoryNotEmptyException when handling "real, non-empty" dir Summary: zip filesystem provider update Reviewed-by: alanb

7015908: 3 javax.script tests fail with openjdk build Reviewed-by: alanb

7011497: new CertPathValidatorException.BasicReason enum constant for constrained algorithm Summary: add new BasicReason and improve trust anchor searching method during cert path validation Reviewed-by: mullan

7015827: Fix HTML validation issues in java.math package Reviewed-by: mduigou

7015156: Remove JSR 308 changes from core libraries Reviewed-by: mduigou

7015410: test/java/net/Socks/SocksProxyVersion.java needs to be updated due to 7013420 Reviewed-by: chegar

Merge

7006126: (fs) Updates to file system API (1/2011) Reviewed-by: chegar, sherman

7013420: Project Coin: remove general expression support from try-with-resources statement Reviewed-by: alanb

7012663: javadoc warning in javax.swing.JComponent and javax.swing.plaf.synth.SynthTextPaneUI Reviewed-by: alexp

Merge

Merge