Updated to latest version of servlet-api.
Minor adjustments to ProxyHandler.