Merge

6956840: (ch) Rawtype warning when compiling sun.nio.ch.CompletedFuture Summary: Add missing generic type to CompletedFuture construction and remove unneeded SuppressWarnings annotations. Reviewed-by: alanb

6955783: ServiceUnavailableException caught even the secondary DNS is available Reviewed-by: vinnie

6934615: Relative classpaths in jarfile manifests are handled inefficiently by rmic Reviewed-by: darcy

6948287: KDC test strange knvo Reviewed-by: xuelei

Merge

4690407: JAR tool: option -i can't be combined with other options Summary: -i can't combined with cxut, do sanity check on options Reviewed-by: martin

Merge

4691425: GZIPInputStream fails to read concatenated .gz files Summary: to support concatenated .gz streams Reviewed-by: martin

6932525: Incorrect encryption types of KDC_REQ_BODY of AS-REQ with pre-authentication Reviewed-by: valeriep

6948781: CertificateFactory.generateCertificate doesn't throw CertificateException for malformed certificate Reviewed-by: mullan

6882687: KerberosTime too imprecise Reviewed-by: valeriep

6954621: small error in 6948909 Reviewed-by: xuelei

6948803: CertPath validation regression caused by SHA1 replacement root and MD2 disable feature Reviewed-by: xuelei, mullan

6773270: java.net.URI fails to escape \u0000 Summary: check for \u0000 Reviewed-by: alanb

6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile Reviewed-by: wetmore