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

[chris.hegarty at oracle.com]

Changeset: 81aa2f98ea52
Author:    chegar
Date:      2017-11-30 11:30 +0000
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/81aa2f98ea52

http-client-branch: merge with default

- src/hotspot/share/classfile/jimage.hpp
- test/jdk/jdk/internal/util/jar/TestVersionedStream.java