Further cleanups of osgi imports. Closes #212
Merge remote-tracking branch 'origin/development' into development