Commiting osgi fixes and adding ndatasource
Fixing osgi changes