JBIDE-18913 - Build failures after renaming of some 'server' bundles

Fixing a bug in a test and using a different method to wait for changes in the console
JBIDE-18913 - Build failures after renaming of some 'server' bundles