Revert some refactoring that removed the bundle reference from the listener info object, since there are some corner cases where the bundle context becomes invalid and we can no longer reach the bundle. (FELIX-3056)