Added support for -java-home as well