NMS-6945: Remove servlet-dependencies and add servlet-api instead.
NMS-6966: Fix freezing Remote Poller UI when closing.