Fixes for OSGi R5.
Update for OSGi R5.
Update for OSGi R5.
Fix build setting warning.