Make WebServerServlet uniform with ComboServlet.
LPS-58339 Make WebServerServlet uniform with ComboServlet