Use servletContext instead of BundleServletContext