Consolidate GraviaServlet to container/common