JBIDE-16867 - regression on server restart using web poller
JBIDE-16865 and small language change JBIDE-16721