Prepare for SSO authentication, plus new EnvironmentServlet