introduced function JettyEmbeddedServletContainerFactory.configureWebAppContext, changed visibility of functions addDefaultServlet and addJspServlet to protected
Merge branch 'master' of github.com:akhikhl/spring-boot