Fix servlet and servlet-jpa-blog archetype template classes