Merge pull request #119 from vivosys/1.6.x

Add osgi example
add test proving that the change fixes the problem with ResourceWatcher
fix merge conflicts