Fix for javax.servlet depedency for jakarta.servlet Change-Id: I3105a18b865b7b4b8c7b94f5952f372e18dd5aea