Rep 740

This is a lot of the "pre" work that needs to be done for the spring integration.

There's a few things that are stupid hard to remove now, `ServicePorts` and `ServletContextHelper` Those things should be removed eventually, and they'll be easier once we establish better replacements.
This could go real bad.