Consolidate LoginServlet and LogoutServlet into AuthServlet + upgrade picketlink