OSGi changes
Merge with master + added OSGi blueprint test