Merge

8003632: HPROF class file version java.lang.RuntimeException errors Reviewed-by: mchung, lancea

8000525: Java.net.httpcookie api does not support 2-digit year format Reviewed-by: chegar

8003890: corelibs test scripts should pass TESTVMOPTS Reviewed-by: chegar, alanb Contributed-by: Mark Sheppard <mark.sheppard@oracle.com>

Merge

7193792: sun/security/pkcs11/ec/TestECDSA.java failing intermittently Reviewed-by: vinnie, wetmore

8004675: Inet6Address.getHostAddress should use string scope identifier where available Summary: ...and some minor stylistic cleanup Reviewed-by: khazra, dsamersoff, michaelm

8004925: java/net/Socks/SocksV4Test.java failing on all platforms Reviewed-by: alanb, dsamersoff

8004357: Implement various methods in SerialBlob/Clob/Array and specify Thread Safety Reviewed-by: naoto

8004235: Disable native JGSS provider on Mac Reviewed-by: erikj, valeriep

8004651: TEST: java/util/logging/CheckLockLocationTest.java failed to delete file (win) Summary: Failure to delete test log file should be a warning instead of test failure Reviewed-by: mduigou, smarks

8004748: clean up @build tags in RMI tests Reviewed-by: alanb, darcy, mchung

8004337: java/sql tests aren't run in test/Makefile Reviewed-by: lancea, alanb

Merge

8004064: Downgrade normative references to ${java.home}/lib/security/java.security Reviewed-by: alanb, vinnie, xuelei

8004874: Reduce dependency on java.beans to only add/removePropertyChangeListener Reviewed-by: ksrini, mchung, dholmes