Merge branch 'issue711' into 1.6.x
Add osgi example
Merge branch 'osgi-example' into 2.0.x
update version to 2.0.0-SNAPSHOT