LPS-44503 Redo with Servlet 3.0 API
LPS-44405  Remove unused var
LPS-44739 SF
LPS-44739 SF