BACKLOG-4464: Use utility method to register jsp servlet + Fix some NPEs