Add JDK installed config paramater, ensure working dir is returned to after JDK installed