If JAVA_HOME is not set, but JRE_HOME is set or guessed, set JAVA_HOME to JRE_HOME before resolving the java executable
If JAVA_HOME is not set, but JRE_HOME is set or guessed, set JAVA_HOME to JRE_HOME before resolving the java executable

Followup to r1811029
Bugzilla Id: 61529


git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1814314 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 0eecd6ba789978d93ee3989feee3943114b6156d
benbenw/jmeter,ham1/jmeter,apache/jmeter,apache/jmeter,benbenw/jmeter,etnetera/jmeter,etnetera/jmeter,ham1/jmeter,apache/jmeter,benbenw/jmeter,ham1/jmeter,benbenw/jmeter,ham1/jmeter,etnetera/jmeter,apache/jmeter,etnetera/jmeter,ham1/jmeter,apache/jmeter,etnetera/jmeter