LPS-44503 Redo with Servlet 3.0 API

Since @rotty3000 told me 7.0 is going to be on servlet 3.0, I am redoing LPS-44503 in a cleaner way.

CC @mhan810