make compile able to search for an appropriate JDK
another merge fix