Glassfish 4.0 Java 7 and 4.1 Java 8

As previously discussed.