activeweb-167 Migrate to Servlet 3 API
Merge remote-tracking branch 'origin/master'