WCM-188

WCM-188 OSGi improvements