Copying changes to OSGi plugin from NSF