hg: jdk9/sandbox/hotspot: Merge

[marcus.larsson at oracle.com]

Changeset: a5d74fc31f94
Author:    mlarsson
Date:      2015-06-05 13:38 +0200
URL:       http://hg.openjdk.java.net/jdk9/sandbox/hotspot/rev/a5d74fc31f94

Merge

! src/share/vm/logging/logConfiguration.cpp
! src/share/vm/logging/logConfiguration.hpp
! src/share/vm/logging/logDiagnosticCommand.cpp
! src/share/vm/logging/logDiagnosticCommand.hpp