RF-13179: use @WebServlet annotation for re-gistering PushServlet and ResourceServlet