hg: jdk/sandbox: http-client-branch: merge with default

[chris.hegarty at oracle.com]

Changeset: 64298b1e890b
Author:    chegar
Date:      2017-12-05 10:28 +0000
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/64298b1e890b

http-client-branch: merge with default

- src/java.base/share/classes/jdk/internal/util/jar/VersionedStream.java
- src/jdk.charsets/share/classes/sun/nio/cs/ext/MS950_HKSCS.java
- test/jdk/java/lang/SecurityManager/NoAWT.java
- test/langtools/tools/javac/6302184/T6302184.java
- test/langtools/tools/javac/6302184/T6302184.out
- test/langtools/tools/javac/doctree/dcapi/OverviewTest.java