Minor generics cleanup
[FABRIC-712] Do not hold locks while calling the OSGi API