Dependency of the Servlet API on version 3 now
feature #4474 : Updating EJB version and maven ejb plugin for EJB 3.1
feature #4474 : Updating EJB configuration and testing timezone settings
Fix the merge conflict about the version of the grizzly and jackson in the pom.xml