Merge "Use sensible default locations for Java"