Merge pull request #337 from apache/hotfix/bundle_activator_issue

Fixes an issue in the bundle activator