SLICE-61 Fixing potential OSGi live-cycle issues