NMS-6945: Remove servlet-dependencies and add servlet-api instead.