Renamed FormServlet to HtmlServlet
Added SoapServlet to enable easier testing of ProxySoapServlet.