Merge "Add testing support for registering OSGi services to AbstractConfigTest"