MetricsServletContextListener
Add license header
Java 6 dies when using Servlet 3
Merge branch 'servlets'