BACKLOG-5340: fix remaining issues with servlet refactoring