Make webapp.base.WebApplicationInitializer abstract to be able to extend in sub-projects
Resolve conflicts