Adding StubServlet, switching back to 7.6 for now