hg: jdk9/sandbox/jdk: Merge

[pavel.rappo at oracle.com]

Changeset: 8f718b81fdc3
Author:    prappo
Date:      2015-03-24 18:11 +0000
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/8f718b81fdc3

Merge

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