hg: jdk9/sandbox/jdk: Merge

[magnus.ihse.bursie at oracle.com]

Changeset: e7f168ea829b
Author:    ihse
Date:      2015-03-24 16:40 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/e7f168ea829b

Merge

- make/gensrc/Gensrc-jdk.jconsole.gmk
- src/jdk.jconsole/share/classes/sun/tools/jconsole/Version.java.template