Upgrade GAE to 1.8.3
Move to Wildfly
Use Undertow extension.
Upgrade javax.servlet
Merge Modules changes.