SLICE-55 Fixing potential OSGi life-cycle issues
Merge branch 'SLICE-58' of https://github.com/Cognifide/Slice into SLICE-58