[DOSGI-229] Fixes
3 files changed