Merge pull request #433 from JCgH4164838Gh792C124B5/WW-5075_S2_6_OSGiPluginUpdate

WW-5075 Fixes for OSGi plugin in 2.6.x