update osgi version
merge master to get deploy working