Fixes IllegalStateException: Invalid BundleContext in the OTR bundle.
Merge branch 'master' of https://github.com:/jitsi/jitsi