hg: jdk9/sandbox/jdk: Merge

[magnus.ihse.bursie at oracle.com]

Changeset: 62a13e071171
Author:    ihse
Date:      2015-11-03 16:45 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/62a13e071171

Merge

! make/launcher/Launcher-java.rmi.gmk
- src/java.rmi/unix/bin/java-rmi.cgi.sh