Java Madness

Remove 1.7 JRE from the template
Add 1.6 and 1.7 JDK from tarball because RPM doesn't support multiple
version installed simultaneously
Create symlinks for /usr/java/latest and /usr/jave/default