Servlet context managing methods renamed to HandlerServlet

Change-Id: I861ba43a6930c8064cc35111909fc57a0b11917c