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

Fixing test failures