Merge "Fix testing support for OSGi services registration under String name(s)"