SEC-2095: Fix Servlet API doc ids