applied code formatting
added apache license header
Removed addMockedServlet from MockServletContext