Move back to servlet 3.0.1 (JEE6) as 3.1.0 requires JDK7