hg: jdk9/hs-rt/hotspot: 2 new changesets

[daniel.daugherty at oracle.com]

Changeset: 0952227d9cfe
Author:    ddmitriev
Date:      2015-10-02 09:04 -0700
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/0952227d9cfe

8138769: [TESTBUG] restore lost line from JDK-8137105 fix
Reviewed-by: dcubed, rdurbin

! test/runtime/CommandLine/VMOptionsFile/TestVMOptionsFile.java

Changeset: 4edb0704e9f3
Author:    dcubed
Date:      2015-10-02 16:48 +0000
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/4edb0704e9f3

Merge