Allow passing $jdk_pkg to tomcat so that we can install JDK7