Restore Tomcat in CLI

Seems to work. I think the problem was the race conditions
that we hopefully already eliminated. I got an out of memory
error running the samples tests in Eclipse, but then it went
away again (something to look out for).

[Fixes #54925992] [bs-280]