Updated AuthServlet to use static getEnvironment
fixed merge conflict