Disabling filering of JAVA_HOME in restart script.
Merge remote-tracking branch 'origin/master'