core-dist OSGi related fixes

Change-Id: I4f4690652604efb1a5f4000da71190c68d70d83a
2 files changed