1) Allow the --Java to simply be where java is installed, instead of the full path to the jvm.dll.
1) Allow the --Java to simply be where java is installed, instead of the full
path to the jvm.dll.

2) When running --Java=java, use the JVM specified in JAVA_HOME over the one
specified in the registry.

Fix for Bug #25789


git-svn-id: d2ff9ed2f92be9d06337bb70c57551c02d1e392c@140722 13f79535-47bb-0310-9956-ffa450edef68

apache/commons-daemon,mohanaraosv/commons-daemon,mohanaraosv/commons-daemon,apache/commons-daemon,apache/commons-daemon,mohanaraosv/commons-daemon,apache/commons-daemon,mohanaraosv/commons-daemon