Upgrade to GAE 1.8.7
Move to Wildfly
Use Undertow extension.
Upgrade javax.servlet
Merge Modules changes.
Upgrade to latest WF libs.
Upgrade to servlet 3.1.
Fix servlet api version.