Changes to support externalizing the servlet configuration