Fix package names and directories for Tomcat 7 on RHEL