hg: jdk9/sandbox/hotspot: Merge

[paul.sandoz at oracle.com]

Changeset: ca593686a4f0
Author:    psandoz
Date:      2015-07-31 12:42 +0200
URL:       http://hg.openjdk.java.net/jdk9/sandbox/hotspot/rev/ca593686a4f0

Merge

! src/share/vm/oops/method.cpp
! src/share/vm/runtime/globals.hpp
- test/serviceability/hprof/cpu002.java