hg: jdk9/sandbox/jdk: Merge

[michael.x.mcmahon at oracle.com]

Changeset: b2bf36b51ce4
Author:    michaelm
Date:      2016-04-22 10:19 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/b2bf36b51ce4

Merge

! src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java
- test/java/util/ServiceLoader/modules/BasicTest.java